diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 03:23:29 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:15:46 +0100 |
| commit | f9f46dc327c7e659e84d558f1309e16e16e8245a (patch) | |
| tree | f402e0b62191769e95e3199c3f635bb8ed7a6da3 /pkgs/os-specific | |
| parent | 5f2b92e3eca8bd2d34d98e82d63783f281363f8f (diff) | |
| download | nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.gz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.bz2 nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.lz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.xz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.zst nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.zip | |
treewide: NIX_*_FLAGS -> string
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 14 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lttng-modules/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pktgen/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 5 |
4 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index faf6dabc227..9f32e3e37dd 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -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 diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index d4b3f374c5b..46c8dec8889 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -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" diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index fd57fa6e37c..aec347ff375 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -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 diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 0d85e6e3a57..4008045938e 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -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") |