diff options
author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2016-03-22 21:51:10 -0400 |
---|---|---|
committer | Daniel Peebles <copumpkin@users.noreply.github.com> | 2016-03-22 21:51:10 -0400 |
commit | 6f5a71dec80142adea90f88d99e60bde3f566c00 (patch) | |
tree | 19bf29d2b0a1885150d721190b147aec4f0a53d9 | |
parent | 0547fd247f9960eeffd01973c55ed99112a57205 (diff) | |
parent | bb63c6a4c45556dbe284d40b8c088ccb37bb7cec (diff) | |
download | nixlib-6f5a71dec80142adea90f88d99e60bde3f566c00.tar nixlib-6f5a71dec80142adea90f88d99e60bde3f566c00.tar.gz nixlib-6f5a71dec80142adea90f88d99e60bde3f566c00.tar.bz2 nixlib-6f5a71dec80142adea90f88d99e60bde3f566c00.tar.lz nixlib-6f5a71dec80142adea90f88d99e60bde3f566c00.tar.xz nixlib-6f5a71dec80142adea90f88d99e60bde3f566c00.tar.zst nixlib-6f5a71dec80142adea90f88d99e60bde3f566c00.zip |
Merge pull request #14134 from ryanartecona/gobjectIntrospection/fix-darwin
gobjectIntrospection: fix darwin build
-rw-r--r-- | pkgs/development/libraries/gobject-introspection/default.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 0f828653858c..959abc44d248 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python -, libintlOrEmpty, autoconf, automake, otool +, libintlOrEmpty, cctools , substituteAll, nixStoreDir ? builtins.storeDir }: # now that gobjectIntrospection creates large .gir files (eg gtk3 case) @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison pkgconfig python ] ++ libintlOrEmpty - ++ stdenv.lib.optional stdenv.isDarwin otool; + ++ stdenv.lib.optional stdenv.isDarwin cctools; propagatedBuildInputs = [ libffi glib ]; - # Tests depend on cairo, which is undesirable (it pulls in lots of - # other dependencies). + # The '--disable-tests' flag is no longer recognized, so can be safely removed + # next time this package changes. configureFlags = [ "--disable-tests" ]; preConfigure = '' @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { homepage = http://live.gnome.org/GObjectIntrospection; maintainers = with maintainers; [ lovek323 urkud lethalman ]; platforms = platforms.unix; - broken = stdenv.isDarwin; longDescription = '' GObject introspection is a middleware layer between C libraries (using diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1b1977d4ab5..26e33e9c62fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6934,6 +6934,7 @@ let gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { nixStoreDir = config.nix.storeDir or builtins.storeDir; + inherit (darwin) cctools; }; goocanvas = callPackage ../development/libraries/goocanvas { }; |