public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107860 from thatsmydoing/redis-tls

This commit is contained in:
Sandro 2021-01-10 14:45:50 +01:00 committed by GitHub
parent 58d897e812 17f33c9be1
commit f3c1e795bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/servers/nosql/redis/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: { stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests
, tlsSupport ? true, openssl
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "6.0.6"; 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. # More cross-compiling fixes.
# Note: this enables libc malloc as a temporary fix for cross-compiling. # 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. # 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! # 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)" ] makeFlags = [ "PREFIX=$(out)" ]
++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] ++ 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; enableParallelBuilding = true;