mimalloc: make use of MI_INSTALL_TOPLEVEL

Fixes:
- Gross file moving in postInstall (maintenance burden)
- Usability of CMake files

Also enables check phase
This commit is contained in:
Mark Vainomaa 2021-06-29 03:51:06 +03:00
parent 13034ba77a
commit 58e6fa615a
No known key found for this signature in database
GPG key ID: 1B3F9523B542D315

View file

@ -17,41 +17,35 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];
cmakeFlags = lib.optional secureBuild [ "-DMI_SECURE=ON" ]; cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optional secureBuild [ "-DMI_SECURE=ON" ];
postInstall = let postInstall = let
rel = lib.versions.majorMinor version; rel = lib.versions.majorMinor version;
suffix = if stdenv.isLinux then "${soext}.${rel}" else ".${rel}${soext}";
in '' in ''
# first, install headers, that's easy # first, move headers and cmake files, that's easy
mkdir -p $dev mkdir -p $dev/lib
mv $out/lib/*/include $dev/include mv $out/include $dev/include
mv $out/cmake $dev/lib/
# move .a and .o files into place
find $out/lib find $out/lib
mv $out/lib/mimalloc-${rel}/libmimalloc*.a $out/lib/libmimalloc.a '' + (lib.optionalString secureBuild ''
mv $out/lib/mimalloc-${rel}/mimalloc*.o $out/lib/mimalloc.o # pretend we're normal mimalloc
ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${suffix}
'' + (if secureBuild then '' ln -sfv $out/lib/libmimalloc-secure${suffix} $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.a $out/lib/libmimalloc.a
ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext} ln -sfv $out/lib/mimalloc-secure.o $out/lib/mimalloc.o
ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc${soext} '');
'' else ''
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-${rel}
'';
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
doCheck = true;
meta = with lib; { meta = with lib; {
description = "Compact, fast, general-purpose memory allocator"; description = "Compact, fast, general-purpose memory allocator";
homepage = "https://github.com/microsoft/mimalloc"; homepage = "https://github.com/microsoft/mimalloc";
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ]; maintainers = with maintainers; [ thoughtpolice ];
badPlatforms = platforms.darwin;
}; };
} }