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

Merge #91818: gperftools: fix on ARM

This commit is contained in:
Vladimír Čunát 2020-07-11 11:08:58 +02:00
parent cb92b4be75 44391a72b2
commit c62e88ab81
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/gperftools/default.nix
View File

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1jb30zxmw7h9qxa8yi76rfxj4ssk60rv8n9y41m6pzqfk9lwis0y"; sha256 = "1jb30zxmw7h9qxa8yi76rfxj4ssk60rv8n9y41m6pzqfk9lwis0y";
}; };
buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux
buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
prePatch = stdenv.lib.optionalString stdenv.isDarwin '' prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile.am --replace stdc++ c++ substituteInPlace Makefile.am --replace stdc++ c++

7
pkgs/servers/nosql/mongodb/mongodb.nix
View File

@ -102,6 +102,13 @@ in stdenv.mkDerivation rec {
rm -f "$out/bin/install_compass" || true rm -f "$out/bin/install_compass" || true
''; '';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
"$out/bin/mongo" --version
runHook postInstallCheck
'';
prefixKey = "--prefix="; prefixKey = "--prefix=";
enableParallelBuilding = true; enableParallelBuilding = true;