diff --git a/pkgs/development/compilers/llvm/13/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/13/lldb/cpu_subtype_arm64e_replacement.patch deleted file mode 100644 index 20d35c9f3ea9..000000000000 --- a/pkgs/development/compilers/llvm/13/lldb/cpu_subtype_arm64e_replacement.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm ---- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm -+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm -@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, - len = sizeof(is_64_bit_capable); - ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); - -- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { -+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers - // The arm64e architecture is a preview. Pretend the host architecture - // is arm64. - cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 7f7aa868d14c..e7d3a20e1f3f 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -264,12 +264,6 @@ let path = ../12; } ]; - "lldb/cpu_subtype_arm64e_replacement.patch" = [ - { - after = "13"; - path = ../13; - } - ]; "lldb/resource-dir.patch" = [ { before = "16"; @@ -697,23 +691,7 @@ let ++ lib.optional (lib.versionOlder metadata.release_version "14") ( metadata.getVersionFile "lldb/gnu-install-dirs.patch" ) - ++ lib.optional (lib.versionAtLeast metadata.release_version "14") ./lldb/gnu-install-dirs.patch - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # 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 ( - 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.optional (lib.versionAtLeast metadata.release_version "14") ./lldb/gnu-install-dirs.patch; } // lib.optionalAttrs (lib.versions.major metadata.release_version == "16") { src = callPackage ( diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 1e2233790738..3fc17e9143ad 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -24,8 +24,6 @@ , patches ? [ ] , enableManpages ? false , devExtraCmakeFlags ? [ ] -, apple-sdk_11 -, darwinMinVersionHook , ... }: @@ -93,14 +91,6 @@ stdenv.mkDerivation (rec { (lib.getLib libclang) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.bootstrap_cmds - ] - ++ lib.optionals - ( - stdenv.targetPlatform.isDarwin - && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" - ) [ - apple-sdk_11 - (darwinMinVersionHook "10.15") ]; hardeningDisable = [ "format" ];