diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-02-26 18:12:13 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-06 16:36:21 -0400 |
| commit | 139fd8b3978931a4d0056d87dcebbc47307c32ec (patch) | |
| tree | 1fc4c404b31a3d67afe42c7871c7ebe874b95f16 /pkgs/development/libraries/gdk-pixbuf | |
| parent | f8347478a8a1aceb9cc4a7df518b444eea756ab6 (diff) | |
gdk-pixbuf: support cross compilation
- add glib to nativeBuildInputs - only update loaders cache on native builds
Diffstat (limited to 'pkgs/development/libraries/gdk-pixbuf')
| -rw-r--r-- | pkgs/development/libraries/gdk-pixbuf/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 0ecbb35c16705..b44fd34ac9d81 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 ''; |