From 77c2f1bb3ce13c3087372eec253c8f9c6ab1e444 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 9 Nov 2024 19:37:32 -0800 Subject: [PATCH] gitoxide: use new Darwin SDK pattern --- pkgs/applications/version-management/gitoxide/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index f78401a5220f..37190b2440c3 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -4,9 +4,7 @@ , cmake , pkg-config , stdenv -, libiconv -, Security -, SystemConfiguration +, apple-sdk_11 , curl , openssl , buildPackages @@ -33,7 +31,7 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin - then [ libiconv Security SystemConfiguration ] + then [ apple-sdk_11 ] else [ openssl ]); preFixup = lib.optionalString canRunCmd '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20efe30fd5b2..e1ee617684a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1250,9 +1250,7 @@ with pkgs; gita = python3Packages.callPackage ../applications/version-management/gita { }; - gitoxide = darwin.apple_sdk_11_0.callPackage ../applications/version-management/gitoxide { - inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration; - }; + gitoxide = callPackage ../applications/version-management/gitoxide { }; github-cli = gh; git-absorb = callPackage ../applications/version-management/git-absorb {