diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-09 00:41:27 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-09 00:41:27 +0200 |
| commit | 99b88cfb5354337ec55e38ae8d42fb08dc14d25b (patch) | |
| tree | 19336faadeb27fb06dca63cf47d0d0db4a07729b /pkgs/development/libraries/atk | |
| parent | 61129e1ee9a37d75f2f26c8eb5de1c984766a461 (diff) | |
| parent | 8c4a613f3a478c1cb2994fb9df3b0eb92d4c7885 (diff) | |
| download | nixlib-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar nixlib-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.gz nixlib-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.bz2 nixlib-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.lz nixlib-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.xz nixlib-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.zst nixlib-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.zip | |
Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts: pkgs/development/libraries/acl/default.nix pkgs/development/libraries/atk/2.6.x.nix pkgs/development/libraries/attr/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/2.34.x.nix pkgs/development/libraries/gtk+/2.24.x.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/openssl/default.nix pkgs/development/libraries/pango/1.30.x.nix pkgs/misc/cups/default.nix pkgs/os-specific/linux/util-linux/default.nix pkgs/servers/x11/xorg/builder.sh pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/atk')
| -rw-r--r-- | pkgs/development/libraries/atk/2.6.x.nix (renamed from pkgs/development/libraries/atk/2.2.x.nix) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/atk/2.2.x.nix b/pkgs/development/libraries/atk/2.6.x.nix index 715d8eb1ee23..82b366b40136 100644 --- a/pkgs/development/libraries/atk/2.2.x.nix +++ b/pkgs/development/libraries/atk/2.6.x.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, pkgconfig, perl, glib }: stdenv.mkDerivation rec { - name = "atk-2.2.0"; + name = "atk-2.6.0"; src = fetchurl { - url = mirror://gnome/sources/atk/2.2/atk-2.2.0.tar.xz; - sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb"; + url = "mirror://gnome/sources/atk/2.6/${name}.tar.xz"; + sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f"; }; enableParallelBuilding = true; outputs = [ "dev" "out" "doc" ]; - buildNativeInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl ]; propagatedBuildInputs = [ glib ]; |