summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-12-08 12:40:13 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-12-08 12:40:13 +0100
commite0950ae9ad7e101c16ce8bbc28d566c75bb298fb (patch)
treeb8a699d2b9218d8a9f6d29abe50d74999286b30e /pkgs/servers
parent12e8ec041a28abd8c5cabd2c9e873df89e41b571 (diff)
parent85d9f63975cd76d78a026f257cd7205d6a1a8801 (diff)
downloadnixpkgs-e0950ae9ad7e101c16ce8bbc28d566c75bb298fb.tar
nixpkgs-e0950ae9ad7e101c16ce8bbc28d566c75bb298fb.tar.gz
nixpkgs-e0950ae9ad7e101c16ce8bbc28d566c75bb298fb.tar.bz2
nixpkgs-e0950ae9ad7e101c16ce8bbc28d566c75bb298fb.tar.lz
nixpkgs-e0950ae9ad7e101c16ce8bbc28d566c75bb298fb.tar.xz
nixpkgs-e0950ae9ad7e101c16ce8bbc28d566c75bb298fb.tar.zst
nixpkgs-e0950ae9ad7e101c16ce8bbc28d566c75bb298fb.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/uwsgi/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index dd397598c97..074b19724d2 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 = [ "-lsystemd" ] ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed;
+  NIX_CFLAGS_LINK = 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/;