From dbe04a0b0c4ab20b199c22b51bf4663d1048fd88 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sun, 27 Jul 2025 15:30:16 +0200 Subject: [PATCH] lixPackageSets.*.lix: stop copying unnecessary boost libraries This is basically the same as https://gerrit.lix.systems/c/lix/+/3767 upstream. --- pkgs/tools/package-management/lix/common-lix.nix | 4 ++-- 1 file 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 f414bd836135..9c08270cc9db 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -229,7 +229,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 @@ -299,7 +299,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" \