diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 02:29:30 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:13:29 +0100 |
| commit | 5f2b92e3eca8bd2d34d98e82d63783f281363f8f (patch) | |
| tree | 504cc52792a07d3d674f6e8d6b3b9eadb378e3e8 /pkgs/servers | |
| parent | ab0cfd9e036ca83bdffb8790f7cf45179441cd93 (diff) | |
| download | nixpkgs-5f2b92e3eca8bd2d34d98e82d63783f281363f8f.tar nixpkgs-5f2b92e3eca8bd2d34d98e82d63783f281363f8f.tar.gz nixpkgs-5f2b92e3eca8bd2d34d98e82d63783f281363f8f.tar.bz2 nixpkgs-5f2b92e3eca8bd2d34d98e82d63783f281363f8f.tar.lz nixpkgs-5f2b92e3eca8bd2d34d98e82d63783f281363f8f.tar.xz nixpkgs-5f2b92e3eca8bd2d34d98e82d63783f281363f8f.tar.zst nixpkgs-5f2b92e3eca8bd2d34d98e82d63783f281363f8f.zip | |
treewide: NIX_*_COMPILE -> string
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/nginx/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/uwsgi/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/web-apps/fileshelter/default.nix | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 2c0dbc7d665..2d1b994faab 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -73,10 +73,10 @@ stdenv.mkDerivation { ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString ([ "-I${libxml2.dev}/include/libxml2" "-Wno-error=implicit-fallthrough" - ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; + ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); configurePlatforms = []; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 556c44b61a7..7669053d229 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; - NIX_CFLAGS_LINK = lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed; + NIX_CFLAGS_LINK = toString (lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed); meta = with stdenv.lib; { homepage = https://uwsgi-docs.readthedocs.org/en/latest/; diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index 47184fe9c96..928d80b1297 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libzip boost wt4 libconfig ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; postInstall = '' ln -s ${wt4}/share/Wt/resources $out/share/fileshelter/docroot/resources |