diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-07-11 11:08:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-07-11 11:08:58 +0200 |
| commit | c62e88ab817761296feeae42bc9bc208af77f144 (patch) | |
| tree | b8af0c59f25db2bc2402c69da4fe2a874bf194d0 /pkgs | |
| parent | cb92b4be75426e21f78341dc9f1a58e39c565b11 (diff) | |
| parent | 44391a72b2e08a31680b934df9585ffa326253dc (diff) | |
| download | nixpkgs-c62e88ab817761296feeae42bc9bc208af77f144.tar nixpkgs-c62e88ab817761296feeae42bc9bc208af77f144.tar.gz nixpkgs-c62e88ab817761296feeae42bc9bc208af77f144.tar.bz2 nixpkgs-c62e88ab817761296feeae42bc9bc208af77f144.tar.lz nixpkgs-c62e88ab817761296feeae42bc9bc208af77f144.tar.xz nixpkgs-c62e88ab817761296feeae42bc9bc208af77f144.tar.zst nixpkgs-c62e88ab817761296feeae42bc9bc208af77f144.zip | |
Merge #91818: gperftools: fix on ARM
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gperftools/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/nosql/mongodb/mongodb.nix | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 039231c0142..410e790255f 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { 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 '' substituteInPlace Makefile.am --replace stdc++ c++ diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 8ffdbcd63c4..2c058edbcca 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -102,6 +102,13 @@ in stdenv.mkDerivation rec { rm -f "$out/bin/install_compass" || true ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + "$out/bin/mongo" --version + runHook postInstallCheck + ''; + prefixKey = "--prefix="; enableParallelBuilding = true; |