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/atk/2.6.x.nix → pkgs/development/libraries/atk/default.nix
+6 -4
View File
@@ -1,17 +1,19 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }:
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "atk-2.6.0";
name = "atk-2.8.0";
src = fetchurl {
url = "mirror://gnome/sources/atk/2.6/${name}.tar.xz";
sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f";
url = "mirror://gnome/sources/atk/2.8/${name}.tar.xz";
sha256 = "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj";
};
enableParallelBuilding = true;
outputs = [ "dev" "out" "doc" ];
buildInputs = libintlOrEmpty;
nativeBuildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [ glib ];