From 390e8e79f3404aa3b5e3140a6567300f5e2b4bfa Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 1 Oct 2024 23:42:10 -0400 Subject: [PATCH] darwin.CoreSymbolication: remove and replace with stubs --- .../darwin/CoreSymbolication/default.nix | 58 ------------------- pkgs/top-level/darwin-packages.nix | 5 +- 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 pkgs/os-specific/darwin/CoreSymbolication/default.nix diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix deleted file mode 100644 index f6b0e2b79c3d..000000000000 --- a/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchpatch, - stdenvNoCC, - darwin-stubs, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "CoreSymbolication"; - inherit (darwin-stubs) version; - - src = fetchFromGitHub { - repo = "CoreSymbolication"; - owner = "matthewbauer"; - rev = "24c87c23664b3ee05dc7a5a87d647ae476a680e4"; - hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE="; - }; - - patches = [ - # Add missing symbol definitions needed to build `zlog` in system_cmds. - # https://github.com/matthewbauer/CoreSymbolication/pull/2 - (fetchpatch { - url = "https://github.com/matthewbauer/CoreSymbolication/commit/ae7ac6a7043dbae8e63d6ce5e63dfaf02b5977fe.patch"; - hash = "sha256-IuXGMsaR1LIGs+BpDU1b4YlznKm9VhK5DQ+Dthtb1mI="; - }) - (fetchpatch { - url = "https://github.com/matthewbauer/CoreSymbolication/commit/6531da946949a94643e6d8424236174ae64fe0ca.patch"; - hash = "sha256-+nDX04yY92yVT9KxiAFY2LxKcS7P8JpU539K+YVRqV4="; - }) - ]; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/Library/Frameworks/CoreSymbolication.framework/Versions/A/Headers - - ln -s A $out/Library/Frameworks/CoreSymbolication.framework/Versions/Current - ln -s Versions/Current/Headers $out/Library/Frameworks/CoreSymbolication.framework/Headers - ln -s Versions/Current/CoreSymbolication.tbd $out/Library/Frameworks/CoreSymbolication.framework/CoreSymbolication.tbd - - cp *.h $out/Library/Frameworks/CoreSymbolication.framework/Versions/A/Headers - cp ${darwin-stubs}/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication.tbd \ - $out/Library/Frameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication.tbd - - runHook postInstall - ''; - - meta = with lib; { - description = "Reverse engineered headers for Apple's CoreSymbolication framework"; - homepage = "https://github.com/matthewbauer/CoreSymbolication"; - license = licenses.mit; - platforms = platforms.darwin; - maintainers = with maintainers; [ matthewbauer ]; - }; -}) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 549bca1ad45c..51a6da90335d 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -71,6 +71,7 @@ makeScopeWithSplicing' { "CF" "CarbonHeaders" "CommonCrypto" + "CoreSymbolication" ] (mkStub apple_sdk.version); in @@ -198,10 +199,6 @@ impure-cmds // appleSourcePackages // stubs // { xcode_15 xcode_15_1 xcode_15_2 xcode_15_3 xcode_15_4 xcode; - CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { - inherit (apple_sdk) darwin-stubs; - }; - xcodeProjectCheckHook = pkgs.makeSetupHook { name = "xcode-project-check-hook"; propagatedBuildInputs = [ pkgs.pkgsBuildHost.openssl ];