diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f3db9bf5977..736014d665c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,18 +3,17 @@ let ver_maj = "2.36"; - ver_min = "0"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c"; + sha256 = "3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d"; }; outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; setupHook = ./setup-hook.sh; @@ -27,14 +26,21 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; + configureFlags = "--with-libjasper --with-x11" + + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" + ; + # on darwin, tests don't link preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' substituteInPlace Makefile --replace "docs tests" "docs" ''; - configureFlags = "--with-libjasper --with-x11" - + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" - ; + postInstall = + # All except one utility seem to be only useful during building. + '' + moveToOutput "bin" "$dev" + moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" + ''; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit (doCheck);