Skip to content

Commit

Permalink
gitoxide: use new Darwin SDK pattern (#354904)
Browse files Browse the repository at this point in the history
  • Loading branch information
tjni authored Nov 12, 2024
2 parents 5703364 + 77c2f1b commit c2bdfe6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
6 changes: 2 additions & 4 deletions pkgs/applications/version-management/gitoxide/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
, cmake
, pkg-config
, stdenv
, libiconv
, Security
, SystemConfiguration
, apple-sdk_11
, curl
, openssl
, buildPackages
Expand All @@ -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 ''
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit c2bdfe6

Please sign in to comment.