diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-09-11 10:51:46 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-09-11 10:53:31 +0200 |
| commit | 1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304 (patch) | |
| tree | 3513b616eec434d455177a877119cdd96a7b4ade /pkgs/development/libraries/atk | |
| parent | 2d405ed4d54ba4d924b5146cea4a39ae65343d59 (diff) | |
| parent | aa8e8303e1b42c5cf5195f3ce82f886664aa26d4 (diff) | |
| download | nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.gz nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.bz2 nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.lz nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.xz nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.zst nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.zip | |
Merge remote-tracking branch 'official/master' into multiple-outputs
Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/libpng/default.nix pkgs/development/libraries/pango/default.nix pkgs/tools/typesetting/tex/texlive/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, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 180392cc5e0..454f395a008 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty }: +{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: stdenv.mkDerivation rec { name = "atk-2.8.0"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig perl ]; - propagatedBuildInputs = [ glib ]; + propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ]; meta = { description = "ATK, the accessibility toolkit"; |