magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix: partially remove some liburing overrides

Browse source 
the argument one is weird and causing build script invalid arguments

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-07-05 20:13:21 -04:00 • committed by June 🍓🦴
parent 83e853e7a3
commit 68ad351f84
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
flake.nix
View file

@ -50,16 +50,6 @@
configureFlags = pkgs.lib.subtractLists configureFlags = pkgs.lib.subtractLists
[ "--enable-static" "--disable-shared" ] [ "--enable-static" "--disable-shared" ]
old.configureFlags; old.configureFlags;
postInstall = old.postInstall + ''
# we remove the extra outputs
#
# we need to do this to prevent rocksdb from trying to link the
# static library in a dynamic stdenv
rm $out/lib/liburing*${
if pkgs.stdenv.hostPlatform.isStatic then ".so*" else ".a"
}
'';
}); });
}); });

5
nix/pkgs/main/default.nix
View file

@ -43,7 +43,7 @@ features'' = lib.subtractLists disable_features' features';
featureEnabled = feature : builtins.elem feature features''; featureEnabled = feature : builtins.elem feature features'';
enableLiburing = featureEnabled "io_uring" && stdenv.isLinux; enableLiburing = featureEnabled "io_uring" && !stdenv.isDarwin;
# This derivation will set the JEMALLOC_OVERRIDE variable, causing the # This derivation will set the JEMALLOC_OVERRIDE variable, causing the
# tikv-jemalloc-sys crate to use the nixpkgs jemalloc instead of building it's # tikv-jemalloc-sys crate to use the nixpkgs jemalloc instead of building it's
@ -74,8 +74,7 @@ buildDepsOnlyEnv =
# TODO: static rocksdb fails to build on darwin # TODO: static rocksdb fails to build on darwin
# build log at <https://girlboss.ceo/~strawberry/pb/JjGH> # build log at <https://girlboss.ceo/~strawberry/pb/JjGH>
meta.broken = stdenv.hostPlatform.isStatic && stdenv.isDarwin; meta.broken = stdenv.hostPlatform.isStatic && stdenv.isDarwin;
# TODO: switch to enableUring option once https://github.com/NixOS/nixpkgs/pull/314945 is available enableLiburing = enableLiburing;
buildInputs = old.buildInputs ++ lib.optional enableLiburing liburing;
}); });
in in
{ {