JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14134 from ryanartecona/gobjectIntrospection/fix-darwin

Browse Source 
gobjectIntrospection: fix darwin build
This commit is contained in:
Daniel Peebles 2016-03-22 21:51:10 -04:00
commit 6f5a71dec8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gobject-introspection/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
, libintlOrEmpty, autoconf, automake, otool , libintlOrEmpty, cctools
, substituteAll, nixStoreDir ? builtins.storeDir , substituteAll, nixStoreDir ? builtins.storeDir
}: }:
# now that gobjectIntrospection creates large .gir files (eg gtk3 case) # now that gobjectIntrospection creates large .gir files (eg gtk3 case)
@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
buildInputs = [ flex bison pkgconfig python ] buildInputs = [ flex bison pkgconfig python ]
++ libintlOrEmpty ++ libintlOrEmpty
++ stdenv.lib.optional stdenv.isDarwin otool; ++ stdenv.lib.optional stdenv.isDarwin cctools;
propagatedBuildInputs = [ libffi glib ]; propagatedBuildInputs = [ libffi glib ];
# Tests depend on cairo, which is undesirable (it pulls in lots of # The '--disable-tests' flag is no longer recognized, so can be safely removed
# other dependencies). # next time this package changes.
configureFlags = [ "--disable-tests" ]; configureFlags = [ "--disable-tests" ];
preConfigure = '' preConfigure = ''
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
homepage = http://live.gnome.org/GObjectIntrospection; homepage = http://live.gnome.org/GObjectIntrospection;
maintainers = with maintainers; [ lovek323 urkud lethalman ]; maintainers = with maintainers; [ lovek323 urkud lethalman ];
platforms = platforms.unix; platforms = platforms.unix;
broken = stdenv.isDarwin;
longDescription = '' longDescription = ''
GObject introspection is a middleware layer between C libraries (using GObject introspection is a middleware layer between C libraries (using

1
pkgs/top-level/all-packages.nix
View File

@ -6934,6 +6934,7 @@ let
gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
nixStoreDir = config.nix.storeDir or builtins.storeDir; nixStoreDir = config.nix.storeDir or builtins.storeDir;
inherit (darwin) cctools;
}; };
goocanvas = callPackage ../development/libraries/goocanvas { }; goocanvas = callPackage ../development/libraries/goocanvas { };