Skip to content

Commit c3d8f2c

Browse files
committed
Fix broken Gits in Nix flake
1 parent b194ce8 commit c3d8f2c

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

flake.nix

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
args = {
6464
stdenv = pkgs.stdenv // { inherit (pkgs) lib; };
6565
python = pkgs.python3;
66+
pkgconfig = pkgs.pkg-config;
6667
};
6768
}).overrideAttrs (new: old: {
6869
name = "git-2.20.1";
@@ -74,6 +75,7 @@
7475
packagePath = "${inputs.nixpkgs-git_2_25_1}/pkgs/applications/version-management/git-and-tools/git";
7576
args = {
7677
stdenv = pkgs.stdenv // { inherit (pkgs) lib; };
78+
pkgconfig = pkgs.pkg-config;
7779
};
7880
};
7981

@@ -82,6 +84,7 @@
8284
packagePath = "${inputs.nixpkgs-git_2_27_0}/pkgs/applications/version-management/git-and-tools/git";
8385
args = {
8486
stdenv = pkgs.stdenv // { inherit (pkgs) lib; };
87+
pkgconfig = pkgs.pkg-config;
8588
};
8689
}).overrideAttrs (new: old: {
8790
outputs = [ "out" ];
@@ -90,11 +93,17 @@
9093
packages.git_2_45_2 = (self.lib.buildGit {
9194
inherit pkgs;
9295
packagePath = "${inputs.nixpkgs-git_2_45_2}/pkgs/applications/version-management/git";
96+
args = {
97+
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security;
98+
};
9399
});
94100

95101
packages.git_2_46_1 = (self.lib.buildGit {
96102
inherit pkgs;
97103
packagePath = "${inputs.nixpkgs-git_2_46_1}/pkgs/applications/version-management/git";
104+
args = {
105+
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security;
106+
};
98107
});
99108

100109
devShells.default = pkgs.mkShell {
@@ -108,8 +117,6 @@
108117
lib.buildGit = { pkgs, packagePath, args ? {} }:
109118
let
110119
defaultArgs = {
111-
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security;
112-
113120
guiSupport = false;
114121
sendEmailSupport = false;
115122
svnSupport = false;

0 commit comments

Comments
 (0)