From e8b81fe04da54e2bd55c6ecdd0b6804a8845a4ca Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 18 Apr 2021 09:40:25 -0400 Subject: redis: add withSystemd argument --- pkgs/servers/nosql/redis/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/servers/nosql') 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; -- cgit 1.4.1