summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-04-18 19:40:04 +0200
committerGitHub <noreply@github.com>2021-04-18 19:40:04 +0200
commit1dd0107ed0d290b08239b7a77d5dc164b81862ab (patch)
tree4a424a6db104fdd62a49d9a473246ee88827f72b
parentef77ef9416ce7a4030f7473738bbeeda9d2a05ac (diff)
parente8b81fe04da54e2bd55c6ecdd0b6804a8845a4ca (diff)
downloadnixpkgs-1dd0107ed0d290b08239b7a77d5dc164b81862ab.tar
nixpkgs-1dd0107ed0d290b08239b7a77d5dc164b81862ab.tar.gz
nixpkgs-1dd0107ed0d290b08239b7a77d5dc164b81862ab.tar.bz2
nixpkgs-1dd0107ed0d290b08239b7a77d5dc164b81862ab.tar.lz
nixpkgs-1dd0107ed0d290b08239b7a77d5dc164b81862ab.tar.xz
nixpkgs-1dd0107ed0d290b08239b7a77d5dc164b81862ab.tar.zst
nixpkgs-1dd0107ed0d290b08239b7a77d5dc164b81862ab.zip
Merge pull request #119802 from veprbl/pr/redis_systemd_option
redis: add withSystemd argument
-rw-r--r--pkgs/servers/nosql/redis/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index b9809a9a105..48dcbb8f813 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, lua, pkg-config, systemd, nixosTests
+{ lib, stdenv, fetchurl, lua, pkg-config, nixosTests
+, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, systemd
 , tlsSupport ? true, openssl
 }:
 
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ lua ]
-    ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd
+    ++ lib.optional withSystemd systemd
     ++ lib.optionals tlsSupport [ openssl ];
   # More cross-compiling fixes.
   # Note: this enables libc malloc as a temporary fix for cross-compiling.
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
   # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
   makeFlags = [ "PREFIX=$(out)" ]
     ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]
-    ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]
+    ++ lib.optional withSystemd [ "USE_SYSTEMD=yes" ]
     ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
 
   enableParallelBuilding = true;