diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/development/libraries/mimalloc | |
parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mimalloc')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/mimalloc/default.nix | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index b3f63ec7e9b9..03a1e77e7bfb 100644 --- a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -7,39 +7,42 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "1.1.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "1i8pwzpcmbf7dxncb984xrnczn1737xqhf1jaizlyw0k1hpiam4v"; + rev = "v${version}"; + sha256 = "1zql498587wvb0gaavnzxj2zm535sgm22x0sjgl4ncfk7ragnv9c"; }; nativeBuildInputs = [ cmake ninja ]; enableParallelBuilding = true; cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ]; - postInstall = '' + postInstall = let + rel = stdenv.lib.versions.majorMinor version; + in '' # first, install headers, that's easy mkdir -p $dev mv $out/lib/*/include $dev/include # move .a and .o files into place - mv $out/lib/mimalloc-1.0/libmimalloc*.a $out/lib/libmimalloc.a - mv $out/lib/mimalloc-1.0/mimalloc*.o $out/lib/mimalloc.o + find $out/lib + mv $out/lib/mimalloc-${rel}/libmimalloc*.a $out/lib/libmimalloc.a + mv $out/lib/mimalloc-${rel}/mimalloc*.o $out/lib/mimalloc.o '' + (if secureBuild then '' - mv $out/lib/mimalloc-1.0/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext}.1.0 - ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext} - ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc${soext} + mv $out/lib/mimalloc-${rel}/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext}.${rel} + ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext} + ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc${soext} '' else '' - mv $out/lib/mimalloc-1.0/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext}.1.0 - ln -sfv $out/lib/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext} + mv $out/lib/mimalloc-${rel}/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext}.${rel} + ln -sfv $out/lib/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext} '') + '' # remote duplicate dir. FIXME: try to fix the .cmake file distribution # so we can re-use it for dependencies... - rm -rf $out/lib/mimalloc-1.0 + rm -rf $out/lib/mimalloc-${rel} ''; outputs = [ "out" "dev" ]; @@ -50,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; + badPlatforms = platforms.darwin; }; } |