diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-13 16:48:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 16:48:38 -0400 |
| commit | e520d6af29158ff6d17c34ec16b1f2e79bccad45 (patch) | |
| tree | ddf031dda697cba7549ed8357ca3454c30433fbd /pkgs/development/libraries/gdk-pixbuf | |
| parent | 940c35568bc2fa135eafe0817027c765d9840469 (diff) | |
| parent | c6ff360cc437d366c10f2f827edd5a7fb47e73c3 (diff) | |
| download | nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.gz nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.bz2 nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.lz nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.xz nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.zst nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.zip | |
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
Diffstat (limited to 'pkgs/development/libraries/gdk-pixbuf')
| -rw-r--r-- | pkgs/development/libraries/gdk-pixbuf/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gdk-pixbuf/setup-hook.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index b45b578eac0..82fbbc967ef 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 - gtk-doc gobject-introspection makeWrapper + gtk-doc gobject-introspection makeWrapper glib ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { + '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - + '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index 06958be3213..bdfd00009dc 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -14,4 +14,4 @@ findGdkPixbufLoaders() { } -addEnvHooks "$hostOffset" findGdkPixbufLoaders +addEnvHooks "$targetOffset" findGdkPixbufLoaders |