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

treewide: NIX_*_FLAGS -> string

Browse Source
This commit is contained in:
Robin Gloster
2019-10-30 12:34:47 +01:00
committed by Jan Tojnar
parent f9f46dc327
commit 313da176d3
89 changed files with 108 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/amqp/qpid-cpp/default.nix
View File

@@ -33,7 +33,7 @@ let
sed -i '/management/d' CMakeLists.txt
'';
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=deprecated-declarations"
"-Wno-error=int-in-bool-context"
"-Wno-error=maybe-uninitialized"

4
pkgs/servers/computing/torque/default.nix
View File

@@ -25,9 +25,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# added to fix build with gcc7
NIX_CFLAGS_COMPILE = [
"-Wno-error" "-fpermissive"
];
NIX_CFLAGS_COMPILE = "-Wno-error -fpermissive";
postPatch = ''
substituteInPlace Makefile.am \

2
pkgs/servers/http/openresty/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ];
nativeBuildInputs = [ perl ];
NIX_CFLAGS_COMPILE = ["-I${libxml2.dev}/include/libxml2"];
NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
preConfigure = ''
patchShebangs .

6
pkgs/servers/http/tengine/default.nix
View File

@@ -84,10 +84,8 @@ stdenv.mkDerivation rec {
++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
++ map (mod: "--add-module=${mod.src}") modules;
NIX_CFLAGS_COMPILE = [
"-I${libxml2.dev}/include/libxml2"
"-Wno-error=implicit-fallthrough"
] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough"
+ optionalString stdenv.isDarwin " -Wno-error=deprecated-declarations";
preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);

7
pkgs/servers/mail/opensmtpd/extras.nix
View File

@@ -76,11 +76,10 @@ stdenv.mkDerivation rec {
"--with-table-redis"
];
NIX_CFLAGS_COMPILE =
stdenv.lib.optional enableRedis
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString enableRedis
"-I${hiredis}/include/hiredis -lhiredis"
++ stdenv.lib.optional enableMysql
"-L${libmysqlclient}/lib/mysql";
+ stdenv.lib.optionalString enableMysql
" -L${libmysqlclient}/lib/mysql";
meta = with stdenv.lib; {
homepage = https://www.opensmtpd.org/;

2
pkgs/servers/mail/postfix/default.nix
View File

@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
make makefiles CCARGS='${ccargs}' AUXLIBS='${auxlibs}'
'';
NIX_LDFLAGS = lib.optional withLDAP "-llber";
NIX_LDFLAGS = lib.optionalString withLDAP "-llber";
installTargets = [ "non-interactive-package" ];

2
pkgs/servers/nosql/mongodb/default.nix
View File

@@ -66,7 +66,7 @@ in stdenv.mkDerivation {
--replace 'engine("wiredTiger")' 'engine("mmapv1")'
'';
NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unused-command-line-argument";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
sconsFlags = [
"--release"