treewide: NIX_*_FLAGS -> string

This commit is contained in:
Robin Gloster
2019-12-31 00:15:46 +01:00
committed by Jan Tojnar
parent 5f2b92e3ec
commit f9f46dc327
47 changed files with 63 additions and 94 deletions
+7 -7
View File
@@ -46,13 +46,13 @@ stdenv.mkDerivation {
# Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff.
NIX_CFLAGS_COMPILE =
[ "-Wno-error=cpp"
"-Wno-error=bool-compare"
"-Wno-error=deprecated-declarations"
"-DOBJDUMP_PATH=\"${binutils}/bin/objdump\""
"-Wno-error=stringop-truncation"
];
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=cpp"
"-Wno-error=bool-compare"
"-Wno-error=deprecated-declarations"
"-DOBJDUMP_PATH=\"${binutils}/bin/objdump\""
"-Wno-error=stringop-truncation"
];
doCheck = false; # requires "sparse"
doInstallCheck = false; # same
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "pic" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-function-declaration" ];
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
preConfigure = ''
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
RTE_TARGET = "x86_64-native-linuxapp-gcc";
GUI = stdenv.lib.optionalString withGtk "true";
NIX_CFLAGS_COMPILE = [ "-msse3" ];
NIX_CFLAGS_COMPILE = "-msse3";
postPatch = let dpdkMajor = lib.versions.major dpdk.version; in ''
substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu
+1 -4
View File
@@ -28,10 +28,7 @@ stdenv.mkDerivation rec {
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
# needed since luajit-2.1.0-beta3
NIX_CFLAGS_COMPILE = [
"-DluaL_reg=luaL_Reg"
"-DluaL_getn(L,i)=((int)lua_objlen(L,i))"
];
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))";
preConfigure = ''
cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl")