diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-10 14:45:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-10 14:45:50 +0100 |
commit | f3c1e795bb05bbbd05eefbf4e9c21a741785d8d7 (patch) | |
tree | a739f5fa4e5a9b7a356df95254c3b4dbb844dc9a | |
parent | 58d897e8128806616588b7c2dbef98184d3fe3fb (diff) | |
parent | 17f33c9be14afa8a21fe0844cd5c3dd7b3a8d02c (diff) | |
download | nixlib-f3c1e795bb05bbbd05eefbf4e9c21a741785d8d7.tar nixlib-f3c1e795bb05bbbd05eefbf4e9c21a741785d8d7.tar.gz nixlib-f3c1e795bb05bbbd05eefbf4e9c21a741785d8d7.tar.bz2 nixlib-f3c1e795bb05bbbd05eefbf4e9c21a741785d8d7.tar.lz nixlib-f3c1e795bb05bbbd05eefbf4e9c21a741785d8d7.tar.xz nixlib-f3c1e795bb05bbbd05eefbf4e9c21a741785d8d7.tar.zst nixlib-f3c1e795bb05bbbd05eefbf4e9c21a741785d8d7.zip |
Merge pull request #107860 from thatsmydoing/redis-tls
-rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 38e12010f416..507416be7339 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: +{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests +, tlsSupport ? true, openssl +}: stdenv.mkDerivation rec { version = "6.0.6"; @@ -18,14 +20,19 @@ stdenv.mkDerivation rec { ''} ''; - buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ lua ] + ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd + ++ stdenv.lib.optionals tlsSupport [ openssl ]; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # 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)" ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] - ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]; + ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"] + ++ stdenv.lib.optionals tlsSupport [ "BUILD_TLS=yes" ]; enableParallelBuilding = true; |