From 2ed29e21b61076dee8e41d1b8501772d27a6fcef Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 2 Sep 2024 19:27:03 -0400 Subject: [PATCH] darwin.CarbonHeaders: remove and replace with stubs --- .../CarbonHeaders/default.nix | 20 ------------------- .../darwin/apple-source-releases/default.nix | 1 - pkgs/top-level/darwin-packages.nix | 1 + 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix deleted file mode 100644 index f3ef0e9151f3..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, appleDerivation', stdenvNoCC }: - -appleDerivation' stdenvNoCC { - dontBuild = true; - - installPhase = '' - mkdir -p $out/include - cp MacTypes.h $out/include - cp ConditionalMacros.h $out/include - - substituteInPlace $out/include/MacTypes.h \ - --replace "CarbonCore/" "" - ''; - - meta = with lib; { - maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.darwin; - license = licenses.apple-psl20; - }; -} diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 675fda696395..c5aa21827244 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -261,7 +261,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { inherit (self.adv_cmds) ps locale; architecture = applePackage "architecture" "osx-10.11.6" "sha256-cUKeMx6mOAxBSRHIdfzsrR65Qv86m7+20XvpKqVfwVI=" {}; AvailabilityVersions = callPackage ./AvailabilityVersions/package.nix { }; - CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "sha256-UNaHvxzYzEBnYYuoMLqWUVprZa6Wqn/3XleoSCco050=" {}; CommonCrypto = applePackage "CommonCrypto" "osx-10.12.6" "sha256-FLgODBrfv+XsGaAjddncYAm/BIJJYw6LcwX/z7ncKFM=" {}; configd = applePackage "configd" "osx-10.8.5" "sha256-6I3FWNjTgds5abEcZrD++s9b+P9a2+qUf8KFAb72DwI=" { Security = applePackage "Security/boot.nix" "osx-10.9.5" "sha256-7qr0IamjCXCobIJ6V9KtvbMBkJDfRCy4C5eqpHJlQLI=" {}; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index d354d162f3cf..1f8ce509550d 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -69,6 +69,7 @@ makeScopeWithSplicing' { inherit apple_sdk apple_sdk_10_12 apple_sdk_11_0 apple_sdk_12_3; } // lib.genAttrs [ "CF" + "CarbonHeaders" ] (mkStub apple_sdk.version); in