From 171c7bc94a044b364782fde51af142466f622dc9 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 10 Nov 2024 23:46:16 -0800 Subject: [PATCH] git-cinnabar: use new Darwin SDK pattern --- .../applications/version-management/git-cinnabar/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/git-cinnabar/default.nix b/pkgs/applications/version-management/git-cinnabar/default.nix index 84a34601d40f..ab43dc030912 100644 --- a/pkgs/applications/version-management/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-cinnabar/default.nix @@ -8,8 +8,6 @@ , curl , zlib , zstd -, libiconv -, CoreServices }: stdenv.mkDerivation (finalAttrs: { @@ -35,9 +33,6 @@ stdenv.mkDerivation (finalAttrs: { curl zlib zstd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - CoreServices ]; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70abdc12e233..c9af00f661fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1229,9 +1229,7 @@ with pkgs; git-branchless = callPackage ../applications/version-management/git-branchless { }; - git-cinnabar = callPackage ../applications/version-management/git-cinnabar { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + git-cinnabar = callPackage ../applications/version-management/git-cinnabar { }; git-cliff = callPackage ../applications/version-management/git-cliff { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;