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/tools/networking/libreswan/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation {
};
# These flags were added to compile v3.18. Try to lift them when updating.
NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral"
NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral"
# these flags were added to build with gcc7
"-Wno-error=implicit-fallthrough"
"-Wno-error=format-truncation"

2
pkgs/tools/networking/network-manager/strongswan.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig ];
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
configureFlags = [
"--without-libnm-glib"

4
pkgs/tools/networking/ntopng/default.nix
View File

@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
sed 's|LIBS += -lstdc++.6||' -i Makefile
'';
NIX_CFLAGS_COMPILE = [ "-fpermissive" ]
++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal";
NIX_CFLAGS_COMPILE = "-fpermissive"
+ stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal";
meta = with stdenv.lib; {
description = "High-speed web-based traffic analysis and flow collection tool";

2
pkgs/tools/networking/ssmtp/default.nix
View File

@@ -36,7 +36,7 @@ stdenv.mkDerivation {
buildInputs = stdenv.lib.optional tlsSupport openssl;
NIX_LDFLAGS = stdenv.lib.optional tlsSupport [ "-lcrypto" ];
NIX_LDFLAGS = stdenv.lib.optionalString tlsSupport "-lcrypto";
meta = with stdenv.lib; {
platforms = platforms.linux;

2
pkgs/tools/networking/tracebox/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-lua=yes" ];
NIX_LDFLAGS = [ "${libpcap}/lib/libpcap.so" "${libcrafter}/lib/libcrafter.so" ];
NIX_LDFLAGS = "${libpcap}/lib/libpcap.so ${libcrafter}/lib/libcrafter.so";
preAutoreconf = ''
substituteInPlace Makefile.am --replace "noinst" ""

6
pkgs/tools/networking/wrk/default.nix
View File

@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
done
'';
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
installPhase = ''
mkdir -p $out/bin
cp wrk $out/bin
'';
meta = with stdenv.lib; {
description = "HTTP benchmarking tool";
homepage = https://github.com/wg/wrk;