diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2021-01-10 15:50:49 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2021-01-10 15:50:49 +0100 |
commit | 0c42bb50279fdafcdaeb8dfc1fcb7fd1b3d51fc5 (patch) | |
tree | 35134d9e1f6ef713650cec6b9f7b6a0407b524fd /pkgs/servers/nosql | |
parent | add2d890824281417852b38cf2804fc01b3bd81e (diff) | |
parent | 9f8b7cb4a8948afe0701e5d717a4ee9cbf38163c (diff) | |
download | nixpkgs-0c42bb50279fdafcdaeb8dfc1fcb7fd1b3d51fc5.tar nixpkgs-0c42bb50279fdafcdaeb8dfc1fcb7fd1b3d51fc5.tar.gz nixpkgs-0c42bb50279fdafcdaeb8dfc1fcb7fd1b3d51fc5.tar.bz2 nixpkgs-0c42bb50279fdafcdaeb8dfc1fcb7fd1b3d51fc5.tar.lz nixpkgs-0c42bb50279fdafcdaeb8dfc1fcb7fd1b3d51fc5.tar.xz nixpkgs-0c42bb50279fdafcdaeb8dfc1fcb7fd1b3d51fc5.tar.zst nixpkgs-0c42bb50279fdafcdaeb8dfc1fcb7fd1b3d51fc5.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/nosql')
-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 38e12010f41..507416be733 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; |