nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-17 16:02:43 +01:00
Code Activity

Improve boost hacks

Browse source
This commit is contained in:
John Ericson 2024-06-27 17:28:31 -04:00
parent 8399bd6b8f
commit 0b539dea4a
11 changed files with 26 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/meson.build
View file

@ -400,6 +400,6 @@ this_library = library(
install_headers(headers, subdir : 'nix', preserve_path : true)
libraries_private = ['-lboost_container']
libraries_private = []
subdir('meson-utils/export')

10
src/libstore/package.nix
View file

@ -86,8 +86,6 @@ mkDerivation (finalAttrs: {
nlohmann_json
];
disallowedReferences = [ boost ];
preConfigure =
# "Inline" .version so it's not a symlink, and includes the suffix
''
@ -112,14 +110,6 @@ mkDerivation (finalAttrs: {
enableParallelBuilding = true;
postInstall =
# Remove absolute path to boost libs that ends up in `Libs.private`
# by default, and would clash with out `disallowedReferences`. Part
# of the https://github.com/NixOS/nixpkgs/issues/45462 workaround.
''
sed -i "$out/lib/pkgconfig/nix-store.pc" -e 's, ${lib.getLib boost}[^ ]*,,g'
'';
separateDebugInfo = !stdenv.hostPlatform.isStatic;
# TODO Always true after https://github.com/NixOS/nixpkgs/issues/318564