nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitoxide: use new Darwin SDK pattern

Browse Source
This commit is contained in:
Theodore Ni 2024-11-09 19:37:32 -08:00
parent e20360e289
commit 77c2f1bb3c
No known key found for this signature in database
GPG Key ID: 48B67583BDDD4474
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/version-management/gitoxide/default.nix
View File

@ -4,9 +4,7 @@
, cmake , cmake
, pkg-config , pkg-config
, stdenv , stdenv
, libiconv , apple-sdk_11
, Security
, SystemConfiguration
, curl , curl
, openssl , openssl
, buildPackages , buildPackages
@ -33,7 +31,7 @@ in rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ cmake pkg-config installShellFiles ]; nativeBuildInputs = [ cmake pkg-config installShellFiles ];
buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin
then [ libiconv Security SystemConfiguration ] then [ apple-sdk_11 ]
else [ openssl ]); else [ openssl ]);
preFixup = lib.optionalString canRunCmd '' preFixup = lib.optionalString canRunCmd ''

4
pkgs/top-level/all-packages.nix
View File

@ -1250,9 +1250,7 @@ with pkgs;
gita = python3Packages.callPackage ../applications/version-management/gita { }; gita = python3Packages.callPackage ../applications/version-management/gita { };
gitoxide = darwin.apple_sdk_11_0.callPackage ../applications/version-management/gitoxide { gitoxide = callPackage ../applications/version-management/gitoxide { };
inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration;
};
github-cli = gh; github-cli = gh;
git-absorb = callPackage ../applications/version-management/git-absorb { git-absorb = callPackage ../applications/version-management/git-absorb {