diff options
| author | Ryan Artecona <ryanartecona@gmail.com> | 2016-03-22 21:07:30 -0400 |
|---|---|---|
| committer | Ryan Artecona <ryanartecona@gmail.com> | 2016-03-22 21:40:15 -0400 |
| commit | bb63c6a4c45556dbe284d40b8c088ccb37bb7cec (patch) | |
| tree | 456ad79392e22c4cb433e4701999e73afe6feb8d /pkgs/development/libraries/gobject-introspection | |
| parent | 18b35bd7417368cebacefea4a10c920a8e5516c4 (diff) | |
| download | nixpkgs-bb63c6a4c45556dbe284d40b8c088ccb37bb7cec.tar nixpkgs-bb63c6a4c45556dbe284d40b8c088ccb37bb7cec.tar.gz nixpkgs-bb63c6a4c45556dbe284d40b8c088ccb37bb7cec.tar.bz2 nixpkgs-bb63c6a4c45556dbe284d40b8c088ccb37bb7cec.tar.lz nixpkgs-bb63c6a4c45556dbe284d40b8c088ccb37bb7cec.tar.xz nixpkgs-bb63c6a4c45556dbe284d40b8c088ccb37bb7cec.tar.zst nixpkgs-bb63c6a4c45556dbe284d40b8c088ccb37bb7cec.zip | |
gobjectIntrospection: fix darwin build
Stop using obsolete `otool` package, preferring `cctools` (which includes otool), on darwin. Remove autoconf & automake from reqs, as they were unused. Fixes #12670
Diffstat (limited to 'pkgs/development/libraries/gobject-introspection')
| -rw-r--r-- | pkgs/development/libraries/gobject-introspection/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 0f828653858..959abc44d24 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 |