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/misc/cups/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
outputs = [ "dev" "out" "doc" "man" ];
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ]
++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ;
++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
propagatedBuildInputs = [ openssl ];