From 074fb9e2a71600c646a8e3314463de763f981537 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Tue, 7 Dec 2021 11:10:30 -0600 Subject: [PATCH 1/2] swift: Fix libuuid path in LIBRARY_PATH that was causing a test failure (cherry picked from commit 7ff4e9a588255949889c4382b2e57ec090c824e7) --- pkgs/development/compilers/swift/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 764c2c93daef..aff0a256c7e9 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -340,7 +340,7 @@ stdenv.mkDerivation { # TODO: consider using stress-tester and integration-test. # Match the wrapped version of Swift to be installed. - export LIBRARY_PATH=${icu}/lib:${libgcc}/lib:${libuuid.out}/lib:$l + export LIBRARY_PATH=${icu}/lib:${libgcc}/lib:${libuuid.lib}/lib:$l checkTarget=check-swift-all-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name} ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}' @@ -363,13 +363,13 @@ stdenv.mkDerivation { --set CC $out/bin/clang \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.out}/lib + --suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.lib}/lib wrapProgram $out/bin/swiftc \ --set CC $out/bin/clang \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.out}/lib + --suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.lib}/lib ''; # Hack to avoid build and install directories in RPATHs. From fa19398167cf2beb8a0a3615cb189f9e42230e91 Mon Sep 17 00:00:00 2001 From: Connor Brewster Date: Wed, 8 Dec 2021 11:15:13 -0600 Subject: [PATCH 2/2] Use lib.makeLibraryPath (cherry picked from commit 9ce1ca6400c1c756b6b3893e5b304e1ab4f3eca6) --- pkgs/development/compilers/swift/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index aff0a256c7e9..b5009195ba7c 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -340,7 +340,7 @@ stdenv.mkDerivation { # TODO: consider using stress-tester and integration-test. # Match the wrapped version of Swift to be installed. - export LIBRARY_PATH=${icu}/lib:${libgcc}/lib:${libuuid.lib}/lib:$l + export LIBRARY_PATH=${lib.makeLibraryPath [icu libgcc libuuid]}:$l checkTarget=check-swift-all-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name} ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}' @@ -363,13 +363,13 @@ stdenv.mkDerivation { --set CC $out/bin/clang \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.lib}/lib + --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} wrapProgram $out/bin/swiftc \ --set CC $out/bin/clang \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \ --suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \ - --suffix LIBRARY_PATH : ${icu}/lib:${libgcc}/lib:${libuuid.lib}/lib + --suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} ''; # Hack to avoid build and install directories in RPATHs.