diff options
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/moltenvk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/autofs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/digimend/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libsemanage/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/netatop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/odp-dpdk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pktgen/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/roccat-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/usbip/default.nix | 2 |
13 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 1033927ce67..9caaf3f90ec 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -550,7 +550,7 @@ in makeScopeWithSplicing path = "usr.bin/config"; version = "9.2"; sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; - NIX_CFLAGS_COMPILE = [ "-DMAKE_BOOTSTRAP" ]; + NIX_CFLAGS_COMPILE = toString [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook makeMinimal install mandoc byacc flex rsync @@ -636,7 +636,7 @@ in makeScopeWithSplicing makeFlags = defaultMakeFlags ++ [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; hardeningDisable = [ "pic" ]; MKKMOD = "no"; - NIX_CFLAGS_COMPILE = [ "-Wa,--no-warn" ]; + NIX_CFLAGS_COMPILE = toString [ "-Wa,--no-warn" ]; postBuild = '' make -C arch/$MACHINE/compile/$CONFIG $makeFlags @@ -715,7 +715,7 @@ in makeScopeWithSplicing --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" substituteInPlace $COMPONENT_PATH/readline/Makefile --replace /usr/include "$out/include" ''; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-D__noinline=" "-D__scanflike(a,b)=" "-D__va_list=va_list" @@ -753,7 +753,7 @@ in makeScopeWithSplicing version = "9.2"; sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal"; buildInputs = with self; [ libterminfo ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-D__scanflike(a,b)=" "-D__va_list=va_list" "-D__warn_references(a,b)=" @@ -821,7 +821,7 @@ in makeScopeWithSplicing path = "lib/libpci"; version = "9.2"; sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; - NIX_CFLAGS_COMPILE = [ "-I." ]; + NIX_CFLAGS_COMPILE = toString [ "-I." ]; meta.platforms = lib.platforms.netbsd; extraPaths = with self; [ sys.src ]; }; diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index d42d142ef6e..e4f2fa49ee0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -12,7 +12,7 @@ appleDerivation { # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__" # + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__" # + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; - NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" + NIX_CFLAGS_COMPILE = toString [ "-DDAEMON_UID=1" "-DDAEMON_GID=1" "-DDEFAULT_AT_QUEUE='a'" "-DDEFAULT_BATCH_QUEUE='b'" diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index 07645c5e61c..622912d43bf 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { dontConfigure = true; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-isystem ${lib.getDev libcxx}/include/c++/v1" "-I${lib.getDev spirv-cross}/include/spirv_cross" "-I${lib.getDev spirv-headers}/include/spirv/unified1/" diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 5e552301fe4..87a94ef04ca 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; # configure script is not finding the right path - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; installPhase = '' make install SUBDIRS="lib daemon modules man" # all but samples diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 70fc58232ab..f3c3e8fd20b 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; # Fix build on Linux kernel >= 5.18 - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index d6b951a7f55..f63169152dc 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { hash = "sha512-KMHgj73eXHT++IE8DbCsFeJ87ngc9R3XxMUJy4Z3s4/MtMeB9zblADHkyJqz9oyeugeJTrDtuVETPBRo7M4Y8A=="; }; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-march=armv8-a+crc" ]; diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index 18586afcd01..1ddc284e2fe 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # 1278 | int i; # | ^ # cc1: all warnings being treated as errors - NIX_CFLAGS_COMPILE = [ "-Wno-error=clobbered" ]; + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=clobbered" ]; installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ]; diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index b892292477c..3e2c1be8b71 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ kmod zlib ]; hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" ]; patches = [ # fix paths in netatop.service diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 5276dfd2aff..a2545ac2ad6 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { $out/bin/nvidia-persistenced ''; - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-ltirpc" ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 7cb364597bb..004f4c9d8f5 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { libbpf ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 "-Wno-error=maybe-uninitialized" "-Wno-error=uninitialized" diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 60a55096b44..fab3a62ef50 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { RTE_SDK = dpdk; GUI = lib.optionalString withGtk "true"; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 "-Wno-error=address" "-Wno-error=use-after-free" diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index 38cbabad520..ac85df75f7a 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "-DLIBDIR=lib" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${harfbuzz.dev}/include/harfbuzz" # Workaround build failure on -fno-common toolchains: diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index cadf38b106c..c39edaa6f01 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ udev ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address-of-packed-member" ]; preConfigure = '' cd tools/usb/usbip |