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

glib on darwin: disable warnings to avoid prototype errors

Browse Source 
vcunat did some reformatting before pushing.
This commit is contained in:
Kevin Quick
2014-01-26 10:31:05 +01:00
committed by Vladimír Čunát
parent ef460bd170
commit 80adf16703
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glib/default.nix
+5 -3
View File
@@ -35,7 +35,7 @@ let
ver_maj = "2.38"; ver_maj = "2.38";
ver_min = "2"; ver_min = "2";
in in
with { inherit (stdenv.lib) optionalString; }; with { inherit (stdenv.lib) optional optionalString; };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glib-${ver_maj}.${ver_min}"; name = "glib-${ver_maj}.${ver_min}";
@@ -55,9 +55,11 @@ stdenv.mkDerivation rec {
preConfigure = "autoreconf -fi"; preConfigure = "autoreconf -fi";
configureFlags = stdenv.lib.optional stdenv.isSunOS "--disable-modular-tests"; configureFlags =
optional stdenv.isDarwin "--disable-compile-warnings"
++ optional stdenv.isSunOS "--disable-modular-tests";
CPPFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-DBSD_COMP"; CPPFLAGS = optionalString stdenv.isSunOS "-DBSD_COMP";
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-lintl"; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-lintl";