diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/foundationdb/cmake.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/gemini/gmnisrv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/mini-httpd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/mail/archiveopteryx/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/memcached/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/mpd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/osrm-backend/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/tvheadend/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/varnish/digest.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 6 |
10 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 436f0a7fc4d..b49f73a4e3c 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -60,7 +60,7 @@ let (lib.optionalString (!useClang) "-DUSE_LD=GOLD") ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 "-Wno-error=missing-template-keyword" ]; diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix index d37a7247ecf..a330de62cf6 100644 --- a/pkgs/servers/gemini/gmnisrv/default.nix +++ b/pkgs/servers/gemini/gmnisrv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ="; }; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ]; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 258eacf768c..e5e957c3f12 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; meta = { homepage = "http://mini-httpd.nongnu.org/"; diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 2bcd87c3b84..0b7a1573fe4 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; # fix build on gcc7+ and gcc11+ - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-std=c++11" # c++17+ has errors "-Wno-error=builtin-declaration-mismatch" "-Wno-error=deprecated-copy" diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 83721ed601d..c108d4775b6 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ] + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ] ++ lib.optional stdenv.isDarwin "-Wno-error"; meta = with lib; { diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d1d94b3a82c..3da8c2232fc 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -166,7 +166,7 @@ let ++ lib.optional (builtins.elem "documentation" features_) "man"; # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream - NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; CXXFLAGS = lib.optionals stdenv.isDarwin [ "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0" diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index cddda5d399f..77d30ff4ffa 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 "-Wno-error=stringop-overflow" "-Wno-error=uninitialized" diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 325632da48c..d0e05d8a485 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 31aaad835bd..650f437186d 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ]; doCheck = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d0a2ec88121..d01eb0d5ab8 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -458,7 +458,7 @@ self: super: xf86videowsfb = super.xf86videowsfb.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videoomap = super.xf86videoomap.overrideAttrs (attrs: { - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ]; + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-overflow" ]; }); xf86videoamdgpu = super.xf86videoamdgpu.overrideAttrs (attrs: { @@ -592,7 +592,7 @@ self: super: xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker - NIX_CFLAGS_COMPILE = [ "-Wno-error=address" ]; # gcc12 + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address" ]; # gcc12 meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; @@ -893,7 +893,7 @@ self: super: "--disable-tls" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 "-Wno-error=array-bounds" ]; |