diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-07-08 10:48:05 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-07-08 10:48:05 +0200 |
commit | 8ba92b8895474728ad5861a156d001e4b6ae38cb (patch) | |
tree | c43914d0523650487580399774c5042bc1bcc4f7 /pkgs/development/libraries/glib | |
parent | 5be89ac73399de1f1aea8371f5e21f493b3d4d45 (diff) | |
parent | 5d8c682f4eb6fe1e35f9fba1388adcdaf5bed05b (diff) |
Merge master into stdenv-updates
Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/glib')
-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 490c21bc422aa..12ce3fcc29b11 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 { @@ -43,10 +43,7 @@ stdenv.mkDerivation (rec { CPPFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-DBSD_COMP"; - 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; @@ -57,12 +54,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 @@ -73,12 +70,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' - ''; -})) |