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

Merge remote-tracking branch 'origin/master' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2013-06-25 18:42:56 +02:00
parent cc61d31902 9dc3599960
commit 552fd3d599
438 changed files with 11405 additions and 3550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gdk-pixbuf/2.26.x.nix → pkgs/development/libraries/gdk-pixbuf/default.nix
+6 -5
View File
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }:
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
, jasper, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "gdk-pixbuf-2.26.1";
name = "gdk-pixbuf-2.28.1";
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/2.26/${name}.tar.xz";
sha256 = "a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba";
url = "mirror://gnome/sources/gdk-pixbuf/2.28/${name}.tar.xz";
sha256 = "1fy2a05xhfg7gy4l4aajsbmgj62zxhikdxqh6bicihxmzm1vg85y";
};
outputs = [ "dev" "out" "bin" "doc" ];
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
buildInputs = [ libX11 ];
buildInputs = [ libX11 libintlOrEmpty ];
nativeBuildInputs = [ pkgconfig ];