diff options
| author | Alois Wohlschlager <alois1@gmx-topmail.de> | 2025-07-27 15:30:16 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2025-08-09 13:13:43 +0000 |
| commit | ffdd32dcfc95282ff372f306636525016c84994c (patch) | |
| tree | 5443f9c507bd7e53af6c9e3a3fa1e40e654e8c3f | |
| parent | capnproto: fix platform offset (diff) | |
| download | nixpkgs-ffdd32dcfc95282ff372f306636525016c84994c.tar.gz | |
lixPackageSets.*.lix: stop copying unnecessary boost libraries
This is basically the same as https://gerrit.lix.systems/c/lix/+/3767 upstream.
(cherry picked from commit dbe04a0b0c4ab20b199c22b51bf4663d1048fd88)
| -rw-r--r-- | pkgs/tools/package-management/lix/common-lix.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index 5d11246f60c3..d5ecd9ac591b 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -228,7 +228,7 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. # https://github.com/NixOS/nixpkgs/issues/45462 - lib.optionalString (!enableStatic) '' + lib.optionalString (lib.versionOlder version "2.91" && !enableStatic) '' mkdir -p $out/lib cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib rm -f $out/lib/*.a @@ -298,7 +298,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/nix-support echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString (lib.versionOlder version "2.91" && stdenv.hostPlatform.isDarwin) '' for lib in liblixutil.dylib liblixexpr.dylib; do install_name_tool \ -change "${lib.getLib boost}/lib/libboost_context.dylib" \ |