Merge pull request #14134 from ryanartecona/gobjectIntrospection/fix-darwin
gobjectIntrospection: fix darwin build
This commit is contained in:
commit
6f5a71dec8
@ -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
|
||||
|
@ -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 { };
|
||||
|
Loading…
Reference in New Issue
Block a user