From 8e7056cc0762ed21cadebfad9d2c27aae91d8fa9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 5 Oct 2024 16:43:17 -0400 Subject: [PATCH] darwin.AvailabilityVersions: remove workaround The patch adding support for `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` to clang has been backported to all versions of clang in nixpkgs (except for clang 12), allowing this workaround to be dropped. --- .../AvailabilityVersions/package.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix index 54b7628a07be..ca7996e6b0cd 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix @@ -84,14 +84,6 @@ mkAppleDerivation (finalAttrs: { "$out/libexec/make_symbol_aliasing.sh" \$threshold "\$dest/include/sys/_symbol_aliasing.h" - # __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__ is only defined by clang 17+, so define it for older versions. - ${lib.getExe gnused} -E '/#ifndef __MAC_OS_X_VERSION_MIN_REQUIRED/{ - i#ifndef __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__ - i#define __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__ __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ - i#endif - }' \\ - -i "\$dest/include/AvailabilityInternal.h" - # Remove macros from newer SDKs because they can confuse some programs about the SDK version. declare -a versionParts=(\''${threshold//./ }) if [ "\''${versionParts[0]}" == "10" ]; then