Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d107668254c2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e66a98e3d53
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 27, 2019

  1. redis: fix syntax

    @globin
    globin committed Oct 27, 2019
    Copy the full SHA
    5e66a98 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/servers/nosql/redis/default.nix
3 changes: 2 additions & 1 deletion pkgs/servers/nosql/redis/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;