Merge pull request #162042 from kamadorueda/mimalloc

This commit is contained in:
Sandro 2022-03-02 15:04:59 +01:00 committed by GitHub
commit 5d5de3be19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja
, fetchpatch
, secureBuild ? false
}:
@ -7,14 +8,28 @@ let
in
stdenv.mkDerivation rec {
pname = "mimalloc";
version = "2.0.2";
version = "2.0.5";
src = fetchFromGitHub {
owner = "microsoft";
repo = pname;
rev = "v${version}";
sha256 = "sha256-n4FGld3bq6ZOSLTzXcVlucCGbQ5/eSFbijU0dfBD/T0=";
sha256 = "sha256-q3W/w1Ofqt6EbKF/Jf9wcC+7jAxh59B3cOGxudWQXlA=";
};
patches = [
(fetchpatch {
name = "older-macos-fixes.patch";
url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch";
sha256 = "15qx2a3axhhwbfzxdis98b8j14y9cfgca0i484aj2pjpqnm0pb8c";
})
];
doCheck = true;
preCheck = let
ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
in ''
export ${ldLibraryPathEnv}="$(pwd)/build:''${${ldLibraryPathEnv}}"
'';
nativeBuildInputs = [ cmake ninja ];
cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optional secureBuild [ "-DMI_SECURE=ON" ];
@ -25,10 +40,9 @@ stdenv.mkDerivation rec {
in ''
# first, move headers and cmake files, that's easy
mkdir -p $dev/lib
mv $out/include $dev/include
mv $out/cmake $dev/lib/
mv $out/lib/cmake $dev/lib/
find $out/lib
find $dev $out -type f
'' + (lib.optionalString secureBuild ''
# pretend we're normal mimalloc
ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${suffix}
@ -44,6 +58,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/microsoft/mimalloc";
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ];
maintainers = with maintainers; [ kamadorueda thoughtpolice ];
};
}