diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2023-01-16 01:02:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-16 01:02:13 +0100 |
| commit | 876b1d46f8045207544a13f8a9ce3e745d7ce9f6 (patch) | |
| tree | ee18ff895f15078bd7363ff22d9e6d97999e107f | |
| parent | afd8814a124451395c71aa3af600af36d522d5d4 (diff) | |
| parent | 521d08ddc7293e73808c29ae856930016dc33422 (diff) | |
| download | nixpkgs-876b1d46f8045207544a13f8a9ce3e745d7ce9f6.tar nixpkgs-876b1d46f8045207544a13f8a9ce3e745d7ce9f6.tar.gz nixpkgs-876b1d46f8045207544a13f8a9ce3e745d7ce9f6.tar.bz2 nixpkgs-876b1d46f8045207544a13f8a9ce3e745d7ce9f6.tar.lz nixpkgs-876b1d46f8045207544a13f8a9ce3e745d7ce9f6.tar.xz nixpkgs-876b1d46f8045207544a13f8a9ce3e745d7ce9f6.tar.zst nixpkgs-876b1d46f8045207544a13f8a9ce3e745d7ce9f6.zip | |
Merge pull request #210903 from yu-re-ka/mimalloc-static
mimalloc: fix static build
| -rw-r--r-- | pkgs/development/libraries/mimalloc/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index 59841e07509..9f7e8ee5917 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-0gX0rEOWT6Lp5AyRyrK5GPTBvAqc5SxSaNJOc5GIgKc="; }; - doCheck = true; + doCheck = !stdenv.hostPlatform.isStatic; preCheck = let ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optionals secureBuild [ "-DMI_SECURE=ON" ]; + cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] + ++ lib.optionals secureBuild [ "-DMI_SECURE=ON" ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DMI_BUILD_SHARED=OFF" ] + ++ lib.optionals (!doCheck) [ "-DMI_BUILD_TESTS=OFF" ] + ; postInstall = let rel = lib.versions.majorMinor version; |