diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
commit | 19530856ed44248c8e14cfc6533b4001318e74d1 (patch) | |
tree | c5c03ca92fdc6af84cffa33cfd4906846013443c /pkgs/development/libraries/atk | |
parent | ca67fccbfe867c7594e87b9f842dababbe3c7403 (diff) | |
parent | 8fe0f0007bb84bafcf5f7209c12c779b24bec7f8 (diff) | |
download | nixpkgs-19530856ed44248c8e14cfc6533b4001318e74d1.tar nixpkgs-19530856ed44248c8e14cfc6533b4001318e74d1.tar.gz nixpkgs-19530856ed44248c8e14cfc6533b4001318e74d1.tar.bz2 nixpkgs-19530856ed44248c8e14cfc6533b4001318e74d1.tar.lz nixpkgs-19530856ed44248c8e14cfc6533b4001318e74d1.tar.xz nixpkgs-19530856ed44248c8e14cfc6533b4001318e74d1.tar.zst nixpkgs-19530856ed44248c8e14cfc6533b4001318e74d1.zip |
Merge remote-tracking branch 'upstream/master' into x-updates
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
Diffstat (limited to 'pkgs/development/libraries/atk')
-rw-r--r-- | pkgs/development/libraries/atk/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index d8e69fbf603..cea207f27bc 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -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 ]; |