diff options
author | Jason "Don" O'Conal <lovek323@gmail.com> | 2013-07-03 22:01:34 +1000 |
---|---|---|
committer | Jason "Don" O'Conal <lovek323@gmail.com> | 2013-07-03 22:03:47 +1000 |
commit | 84f5d870f38e753b2e5de505aa2958b4ac2e8e23 (patch) | |
tree | 2f5538f7ebd2a04dec4f13330e70fec1255b0799 /pkgs/development/libraries/glib/default.nix | |
parent | 3b54af72b17c33bfafcd748156475f3f432bbdec (diff) | |
download | nixpkgs-84f5d870f38e753b2e5de505aa2958b4ac2e8e23.tar nixpkgs-84f5d870f38e753b2e5de505aa2958b4ac2e8e23.tar.gz nixpkgs-84f5d870f38e753b2e5de505aa2958b4ac2e8e23.tar.bz2 nixpkgs-84f5d870f38e753b2e5de505aa2958b4ac2e8e23.tar.lz nixpkgs-84f5d870f38e753b2e5de505aa2958b4ac2e8e23.tar.xz nixpkgs-84f5d870f38e753b2e5de505aa2958b4ac2e8e23.tar.zst nixpkgs-84f5d870f38e753b2e5de505aa2958b4ac2e8e23.zip |
glib: remove unnecessary restrictions on darwin
Diffstat (limited to 'pkgs/development/libraries/glib/default.nix')
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 7469b07ce86..b500967af78 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -24,7 +24,7 @@ let ''; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "glib-2.36.1"; src = fetchurl { @@ -41,10 +41,7 @@ stdenv.mkDerivation (rec { configureFlags = "--with-pcre=system --disable-fam"; - 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>' - ''; + postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h"; enableParallelBuilding = true; @@ -55,12 +52,12 @@ stdenv.mkDerivation (rec { inherit flattenInclude; }; - meta = { + meta = with stdenv.lib; { 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; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ lovek323 raskin urkud ]; + platforms = platforms.unix; longDescription = '' 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' - ''; -})) |