Merge pull request #107860 from thatsmydoing/redis-tls

Sandro f3c1e795 58d897e8

Changed files
+10 -3
pkgs
servers
nosql
redis
+10 -3
pkgs/servers/nosql/redis/default.nix
···
-
{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }:
stdenv.mkDerivation rec {
version = "6.0.6";
···
''}
'';
-
buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd;
# 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"];
enableParallelBuilding = true;
···
+
{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests
+
, tlsSupport ? true, openssl
+
}:
stdenv.mkDerivation rec {
version = "6.0.6";
···
''}
'';
+
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.optionals tlsSupport [ "BUILD_TLS=yes" ];
enableParallelBuilding = true;