ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-02 02:27:33 +03:00
Code Issues Projects Releases Wiki Activity

git: fix failing build on Darwin

Browse Source
This commit is contained in:
Randy Eckenrode 2022-04-25 13:07:21 -04:00
parent 073cad8fd6
commit 0e5763e31b
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -13,7 +13,7 @@
, pythonSupport ? true
, withpcre2 ? true
, sendEmailSupport ? false
, darwin
, Security, CoreServices
, nixosTests
, withLibsecret ? false
, pkg-config, glib, libsecret
@ -79,7 +79,7 @@ stdenv.mkDerivation {
++ lib.optionals perlSupport [ perlPackages.perl ]
++ lib.optionals guiSupport [tcl tk]
++ lib.optionals withpcre2 [ pcre2 ]
++ lib.optionals stdenv.isDarwin [ darwin.Security ]
++ lib.optionals stdenv.isDarwin [ Security CoreServices ]
++ lib.optionals withLibsecret [ pkg-config glib libsecret ];
# required to support pthread_cancel()

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

@ -26495,6 +26495,7 @@ with pkgs;
};
git = callPackage ../applications/version-management/git-and-tools/git {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
smtpPerlLibs = [
perlPackages.libnet perlPackages.NetSMTPSSL