public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdk-pixbuf: security 2.36.0 -> 2.36.2

Browse Source 
/cc #21457.  The rebuild impact is probably only a few thousand.
The new utility is put into $out/bin/.
This commit is contained in:
Vladimír Čunát 2016-12-28 20:16:12 +01:00
parent 5ac7da9376
commit 421a7f37fa
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -3,18 +3,17 @@
let let
ver_maj = "2.36"; ver_maj = "2.36";
ver_min = "0"; ver_min = "2";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gdk-pixbuf-${ver_maj}.${ver_min}"; name = "gdk-pixbuf-${ver_maj}.${ver_min}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
sha256 = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c"; sha256 = "3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d";
}; };
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
@ -27,14 +26,21 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; 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 # on darwin, tests don't link
preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
substituteInPlace Makefile --replace "docs tests" "docs" substituteInPlace Makefile --replace "docs tests" "docs"
''; '';
configureFlags = "--with-libjasper --with-x11" postInstall =
+ stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" # 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). # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
inherit (doCheck); inherit (doCheck);