pyrox.dev
Merge pull request #107860 from thatsmydoing/redis-tls
+10
-3
pkgs/servers/nosql/redis/default.nix
+10
-3
pkgs/servers/nosql/redis/default.nix
···
1
-
{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }:
2
3
stdenv.mkDerivation rec {
4
version = "6.0.6";
···
18
''}
19
'';
20
21
-
buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd;
22
# More cross-compiling fixes.
23
# Note: this enables libc malloc as a temporary fix for cross-compiling.
24
# Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator.
25
# It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
26
makeFlags = [ "PREFIX=$(out)" ]
27
++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]
28
-
++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"];
29
30
enableParallelBuilding = true;
31
···
1
+
{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests
2
+
, tlsSupport ? true, openssl
3
+
}:
4
5
stdenv.mkDerivation rec {
6
version = "6.0.6";
···
20
''}
21
'';
22
23
+
nativeBuildInputs = [ pkgconfig ];
24
+
25
+
buildInputs = [ lua ]
26
+
++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd
27
+
++ stdenv.lib.optionals tlsSupport [ openssl ];
28
# More cross-compiling fixes.
29
# Note: this enables libc malloc as a temporary fix for cross-compiling.
30
# Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator.
31
# It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them!
32
makeFlags = [ "PREFIX=$(out)" ]
33
++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]
34
+
++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]
35
+
++ stdenv.lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
36
37
enableParallelBuilding = true;
38