diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-12-28 20:16:12 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-12-28 20:32:57 +0100 |
commit | 421a7f37fa62c92921e4d0b8853427317f561733 (patch) | |
tree | 846095396a29f8b486bfa97bf37629b61841e03a /pkgs/development/libraries/gdk-pixbuf | |
parent | 5ac7da93760905148581a543fdb24ce376b69441 (diff) | |
download | nixlib-421a7f37fa62c92921e4d0b8853427317f561733.tar nixlib-421a7f37fa62c92921e4d0b8853427317f561733.tar.gz nixlib-421a7f37fa62c92921e4d0b8853427317f561733.tar.bz2 nixlib-421a7f37fa62c92921e4d0b8853427317f561733.tar.lz nixlib-421a7f37fa62c92921e4d0b8853427317f561733.tar.xz nixlib-421a7f37fa62c92921e4d0b8853427317f561733.tar.zst nixlib-421a7f37fa62c92921e4d0b8853427317f561733.zip |
gdk-pixbuf: security 2.36.0 -> 2.36.2
/cc #21457. The rebuild impact is probably only a few thousand. The new utility is put into $out/bin/.
Diffstat (limited to 'pkgs/development/libraries/gdk-pixbuf')
-rw-r--r-- | pkgs/development/libraries/gdk-pixbuf/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f3db9bf59776..736014d665ca 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); |