diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 01:40:49 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:10:18 +0100 |
| commit | ab0cfd9e036ca83bdffb8790f7cf45179441cd93 (patch) | |
| tree | 006ede78e54ee19818bb6e6830e0c2a6f93f05f2 /pkgs/servers | |
| parent | 981ae25113c13b7989e89b8b57be25d9e186a63e (diff) | |
| download | nixlib-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar nixlib-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar.gz nixlib-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar.bz2 nixlib-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar.lz nixlib-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar.xz nixlib-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.tar.zst nixlib-ab0cfd9e036ca83bdffb8790f7cf45179441cd93.zip | |
treewide: NIX_*_COMPILE -> string
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mail/archiveopteryx/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 3443a508aea4..55cc4c121f0f 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+ - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=builtin-declaration-mismatch" "-Wno-error=implicit-fallthrough" "-Wno-error=deprecated-copy" diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index ef75dad91517..e41930a2f485 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -17,7 +17,7 @@ let # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory" dontFixCmake = lib.versionAtLeast version "3.5"; - NIX_CFLAGS_COMPILE = lib.optionals (lib.versionAtLeast version "3.5") [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast version "3.5") "-Wno-error"; preConfigure = lib.optionalString (lib.versionAtLeast version "3.5") "patchShebangs utils"; postPatch = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 440375db841d..3f05b3e36c19 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -44,7 +44,7 @@ let buildFlags = [ "world" ]; - NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; # Otherwise it retains a reference to compiler and fails; see #44767. TODO: better. preConfigure = "CC=${stdenv.cc.targetPrefix}cc"; |