mirror of
https://github.com/urbit/shrub.git
synced 2024-09-11 12:25:43 +03:00
build: correct lmdb static builds
This commit is contained in:
parent
d9ba577721
commit
4f1acce662
@ -105,7 +105,7 @@ let
|
||||
# Additional top-level packages and attributes exposed for convenience.
|
||||
pkgsExtra = with pkgsLocal; rec {
|
||||
# Expose packages with local customisations (like patches) for dev access.
|
||||
inherit (pkgsCross) libsigsegv;
|
||||
inherit (pkgsStatic) libsigsegv lmdb;
|
||||
|
||||
urbit-debug = urbit.override { enableDebug = true; };
|
||||
urbit-tests = libLocal.testFakeShip {
|
||||
|
@ -24,5 +24,5 @@ in prev.lib.optionalAttrs isMusl {
|
||||
|
||||
numactl = overrideStdenv prev.numactl;
|
||||
|
||||
lmdb = overrideStdenv prev.lmdb;
|
||||
# lmdb = overrideStdenv prev.lmdb;
|
||||
}
|
||||
|
@ -26,12 +26,8 @@ in {
|
||||
|
||||
lmdb = prev.lmdb.overrideAttrs (old:
|
||||
configureFlags old // {
|
||||
# Why remove the so version? It's easier than preventing it from being
|
||||
# built with lmdb's custom Makefiles, and it can't exist in the output
|
||||
# because otherwise the linker will preferentially choose the .so over
|
||||
# the .a.
|
||||
postInstall = ''
|
||||
rm $out/lib/liblmdb.so
|
||||
postPatch = ''
|
||||
sed '/^ILIBS\t/s/liblmdb\$(SOEXT)//' -i Makefile
|
||||
'';
|
||||
});
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user