From ce6c31c312584ce8f5a32fd7bbfe5e89734524b4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 15 Oct 2024 13:44:01 +0200 Subject: [PATCH] llvmPackages_{12,13}.lldb: don't try to find nonexistent patch We just need to make sure the attribute evaluates so we can cleanly access `meta.broken` for those versions. --- pkgs/development/compilers/llvm/common/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 707bb91b875d..9d74c65eaaf1 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -713,8 +713,12 @@ let # # See here for some context: # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + # + # Patch is applied for >= 14 as the versions below are broken anyways. ++ lib.optional ( - stdenv.targetPlatform.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" + lib.versionAtLeast metadata.release_version "14" + && stdenv.targetPlatform.isDarwin + && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" ) (metadata.getVersionFile "lldb/cpu_subtype_arm64e_replacement.patch"); } // lib.optionalAttrs (lib.versions.major metadata.release_version == "16") {