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

glib: remove unnecessary restrictions on darwin

Browse Source
This commit is contained in:
Jason "Don" O'Conal 2013-07-03 22:01:34 +10:00
parent 3b54af72b1
commit 84f5d870f3
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ let
''; '';
in in
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
name = "glib-2.36.1"; name = "glib-2.36.1";
src = fetchurl { src = fetchurl {
@ -41,10 +41,7 @@ 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";
+ stdenv.lib.optionalString stdenv.isDarwin ''
sed '24 i #include <Foundation/Foundation.h>'
'';
enableParallelBuilding = true; enableParallelBuilding = true;
@ -55,12 +52,12 @@ stdenv.mkDerivation (rec {
inherit flattenInclude; inherit flattenInclude;
}; };
meta = { meta = with stdenv.lib; {
description = "GLib, a C library of programming buildings blocks"; description = "GLib, a C library of programming buildings blocks";
homepage = http://www.gtk.org/; homepage = http://www.gtk.org/;
license = "LGPLv2+"; license = licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ raskin urkud lovek323 ]; maintainers = with maintainers; [ lovek323 raskin urkud ];
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
longDescription = '' longDescription = ''
GLib provides the core application building blocks for libraries GLib provides the core application building blocks for libraries
@ -71,12 +68,3 @@ stdenv.mkDerivation (rec {
}; };
} }
//
(stdenv.lib.optionalAttrs stdenv.isDarwin {
# XXX: Disable the NeXTstep back-end because stdenv.gcc doesn't support
# Objective-C.
postConfigure =
'' sed -i configure -e's/glib_have_cocoa=yes/glib_have_cocoa=no/g'
'';
}))