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

glib: fix on darwin (merge #644)

Browse Source 
* include Foundation.h header
* add myself to maintainers
* build with gccApple

@vcunat: minor refactoring.
This commit is contained in:
Jason \"Don\" O'Conal 2013-06-18 16:00:46 +10:00 committed by Vladimír Čunát
parent 5de6c72638
commit 85bfa943f7
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/glib/default.nix
View File

@ -41,7 +41,10 @@ stdenv.mkDerivation (rec {
configureFlags = "--with-pcre=system --disable-fam"; configureFlags = "--with-pcre=system --disable-fam";
postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h"; # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-) postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h" # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-)
+ stdenv.lib.optionalString stdenv.isDarwin ''
sed '24 i #include <Foundation/Foundation.h>'
'';
enableParallelBuilding = true; enableParallelBuilding = true;
@ -54,6 +57,10 @@ stdenv.mkDerivation (rec {
meta = { meta = {
description = "GLib, a C library of programming buildings blocks"; description = "GLib, a C library of programming buildings blocks";
homepage = http://www.gtk.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [ raskin urkud lovek323 ];
platforms = stdenv.lib.platforms.unix;
longDescription = '' longDescription = ''
GLib provides the core application building blocks for libraries GLib provides the core application building blocks for libraries
@ -61,13 +68,6 @@ stdenv.mkDerivation (rec {
system used in GNOME, the main loop implementation, and a large system used in GNOME, the main loop implementation, and a large
set of utility functions for strings and common data structures. set of utility functions for strings and common data structures.
''; '';
homepage = http://www.gtk.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [raskin urkud];
platforms = stdenv.lib.platforms.linux;
}; };
} }

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

@ -4105,7 +4105,11 @@ let
gtkmm; gtkmm;
}; };
glib = callPackage ../development/libraries/glib { }; glib = callPackage ../development/libraries/glib {
stdenv = if stdenv.isDarwin
then overrideGCC stdenv gccApple
else stdenv;
};
glibmm = callPackage ../development/libraries/glibmm { }; glibmm = callPackage ../development/libraries/glibmm { };
glib_networking = callPackage ../development/libraries/glib-networking {}; glib_networking = callPackage ../development/libraries/glib-networking {};