From 1865ae4be0e7e046172c287c805a7581224a1f41 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 10 Jan 2026 18:15:54 +0000 Subject: [PATCH] llvmPackages.libllvm: deduplicate Darwin patches --- pkgs/development/compilers/llvm/common/llvm/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 00171a97068e..65322e5ac3af 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -293,21 +293,14 @@ stdenv.mkDerivation ( '' + # fails when run in sandbox - optionalString (!stdenv.hostPlatform.isx86) '' + '' substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" '' ) + - # dup of above patch with different conditions optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86) - # fails when run in sandbox ( - '' - substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ - --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" - '' - + # This test fails on darwin x86_64 because `sw_vers` reports a different # macOS version than what LLVM finds by reading # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into