mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
glib on darwin: disable warnings to avoid prototype errors
vcunat did some reformatting before pushing.
This commit is contained in:
parent
ef460bd170
commit
80adf16703
@ -35,7 +35,7 @@ let
|
||||
ver_maj = "2.38";
|
||||
ver_min = "2";
|
||||
in
|
||||
with { inherit (stdenv.lib) optionalString; };
|
||||
with { inherit (stdenv.lib) optional optionalString; };
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glib-${ver_maj}.${ver_min}";
|
||||
@ -55,9 +55,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
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";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user