From 87f17273e56eb2105a740a1831a1cdabb656fd6a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 20 Jul 2025 11:37:55 +0200 Subject: [PATCH] Revert "libunwind: fix building with llvm" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0fb2bc98952e3815d6ea87d0dd3c221207656962. The patch is now applied in the libunwind sources. This means that for the last couple of months at least, the patch has been breaking the LLVM build rather than fixing it — a good demonstration of why we generally avoid conditional patch application. --- pkgs/development/libraries/libunwind/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 0f7b5de4f94d..6e04c94e78d7 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, - fetchpatch, fetchFromGitHub, autoreconfHook, buildPackages, @@ -20,11 +19,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MsUReXFHlj15SgEZHOYhdSfAbSeVVl8LCi4NnUwvhpw="; }; - patches = lib.optional (stdenv.targetPlatform.useLLVM or false) (fetchpatch { - url = "https://github.com/libunwind/libunwind/pull/770/commits/a69d0f14c9e6c46e82ba6e02fcdedb2eb63b7f7f.patch"; - hash = "sha256-9oBZimCXonNN++jJs3emp9w+q1aj3eNzvSKPgh92itA="; - }); - postPatch = if (stdenv.cc.isClang || stdenv.hostPlatform.isStatic) then ''