git.iko.soy/typeable/nixpkgs
on master help sign in
mimalloc: (really) unbreak dynamic linking

4d392099 didn't quite do the trick, but this should finally fix everything -- namely, the -secure.so symlink was broken, and libmimalloc.so itself was also a symlink that needed to be replaced with the real shared object file. Signed-off-by: Austin Seipp <aseipp@pobox.com>

commita2f9bcd1328de9c043d7425e45d06fc05e0b7929 authorAustin Seipp <aseipp@pobox.com> dateWed 4 Dec 2019, 16:24 (7 years ago) parent58aa380
1 file changed+7−4
pkgs/development/libraries/mimalloc/default.nix+7−4
pkgs/development/libraries/mimalloc/default.nix+7−4
@@ -26,13 +26,16 @@ stdenv.mkDerivation rec {
2626 mv $out/lib/*/include $dev/include
2727
2828 # move everything else into place
29− mv $out/lib/*/libmimalloc*${soext} $out/lib/libmimalloc${soext}
30− mv $out/lib/*/libmimalloc*.a $out/lib/libmimalloc.a
31− mv $out/lib/*/mimalloc*.o $out/lib/mimalloc.o
29+ mv $out/lib/mimalloc-1.0/libmimalloc*${soext}.1.0 $out/lib/libmimalloc${soext}
30+ mv $out/lib/mimalloc-1.0/libmimalloc*.a $out/lib/libmimalloc.a
31+ mv $out/lib/mimalloc-1.0/mimalloc*.o $out/lib/mimalloc.o
3232
3333 # remote duplicate dir. FIXME: try to fix the .cmake file distribution
3434 # so we can re-use it for dependencies...
35− rm -r $out/lib/mimalloc-1.0/
35+ rm -rf $out/lib/mimalloc-1.0
36+ '' + stdenv.lib.optionalString secureBuild ''
37+ # fix a broken symlink for the -secure alias
38+ ln -sfv $out/lib/libmimalloc.so $out/lib/libmimalloc-secure.so
3639 '';
3740
3841 outputs = [ "out" "dev" ];