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

Merge remote-tracking branch 'upstream/master' into x-updates

Browse Source 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Michael Raskin
2013-06-13 17:12:43 +04:00
parent ca67fccbfe 8fe0f0007b
commit 19530856ed
55 changed files with 1041 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/atk/default.nix
+3 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }:
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "atk-2.8.0";
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj";
};
buildInputs = libintlOrEmpty;
nativeBuildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [ glib ];