diff options
| author | Merijn Broeren <merijnb@iloquent.com> | 2019-10-27 13:03:25 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 12:58:11 +0100 |
| commit | 133103d7094c148bdc9152562b16c8872c44f345 (patch) | |
| tree | 2ccef8bd86eff2104561da4eccdd41dd6776950b /pkgs/servers/nosql/redis/default.nix | |
| parent | 08d5fc393457121b531417ee6c922e3ebee0187c (diff) | |
| download | nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar.gz nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar.bz2 nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar.lz nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar.xz nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.tar.zst nixpkgs-133103d7094c148bdc9152562b16c8872c44f345.zip | |
treewide: replace make/build/configure/patchFlags with nix lists
Diffstat (limited to 'pkgs/servers/nosql/redis/default.nix')
| -rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 4b1003db284..278ba8d13c5 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { # 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.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " AR=${stdenv.cc.targetPrefix}ar RANLIB=${stdenv.cc.targetPrefix}ranlib MALLOC=libc"; + makeFlags = [ "PREFIX=$(out)" ] + ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]; enableParallelBuilding = true; |