diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2020-02-28 14:12:16 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-06 16:36:22 -0400 |
commit | 6c5983a291530f040deb97881e80cca373a5b29e (patch) | |
tree | 93c5fa216bbec85538f6db57bcb6d78128ee9519 /nixos | |
parent | 93a8887531ac95f3b5bf0b6a0520908ddf711df5 (diff) |
gdk-pixbuf: make target env hook
Unfortunately, we need to emulate the system to get a real cache.
Native version doesn’t know the right paths.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/x11/gdk-pixbuf.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix index 9ad926369ec7..e6a24a2f1a30 100644 --- a/nixos/modules/services/x11/gdk-pixbuf.nix +++ b/nixos/modules/services/x11/gdk-pixbuf.nix @@ -19,7 +19,7 @@ let continue fi GDK_PIXBUF_MODULEDIR="$module_dir" \ - ${pkgs.gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders + ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${pkgs.gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders done ) > "$out" ''; @@ -37,7 +37,7 @@ in # If there is any package configured in modulePackages, we generate the # loaders.cache based on that and set the environment variable # GDK_PIXBUF_MODULE_FILE to point to it. - config = mkIf (cfg.modulePackages != []) { + config = mkIf (cfg.modulePackages != [] || pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform) { environment.variables = { GDK_PIXBUF_MODULE_FILE = "${loadersCache}"; }; |