talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Git buildEnv is failing.

Browse Source
This commit is contained in:
Tom Alexander 2025-01-23 20:49:27 -05:00
parent 9b9a103e49
commit cdc4bdffb6
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nix/configuration/hosts/odo/default.nix
View File

@ -37,7 +37,7 @@
me.docker.enable = true; me.docker.enable = true;
me.emacs_flavor = "full"; me.emacs_flavor = "full";
me.firefox.enable = true; me.firefox.enable = true;
me.git.config = ./roles/git/files/gitconfig_home; me.git.config = ../../roles/git/files/gitconfig_home;
me.graphical = true; me.graphical = true;
me.graphics_card_type = "amd"; me.graphics_card_type = "amd";
me.kanshi.enable = true; me.kanshi.enable = true;

98
nix/configuration/roles/git/default.nix
View File

@ -32,54 +32,54 @@
}; };
}; };
}) })
(lib.mkIf (config.me.graphical) { # (lib.mkIf (config.me.graphical) {
nixpkgs.overlays = [ # nixpkgs.overlays = [
(final: prev: { # (final: prev: {
git = pkgs.buildEnv { # git = pkgs.buildEnv {
name = prev.git.name; # name = prev.git.name;
paths = [ # paths = [
prev.git # prev.git
]; # ];
extraOutputsToInstall = [ # extraOutputsToInstall = [
"man" # "man"
"doc" # "doc"
"info" # "info"
]; # ];
buildInputs = [ final.makeWrapper ]; # buildInputs = [ final.makeWrapper ];
postBuild = '' # postBuild = ''
wrapProgram $out/bin/git --prefix PATH : ${ # wrapProgram $out/bin/git --prefix PATH : ${
lib.makeBinPath [ # lib.makeBinPath [
final.meld # final.meld
] # ]
} # }
''; # '';
}; # };
}) # })
]; # ];
}) # })
(lib.mkIf (!config.me.graphical) { # (lib.mkIf (!config.me.graphical) {
nixpkgs.overlays = [ # nixpkgs.overlays = [
(final: prev: { # (final: prev: {
git = pkgs.buildEnv { # git = pkgs.buildEnv {
name = prev.git.name; # name = prev.git.name;
paths = [ # paths = [
prev.git # prev.git
]; # ];
extraOutputsToInstall = [ # extraOutputsToInstall = [
"man" # "man"
"doc" # "doc"
"info" # "info"
]; # ];
buildInputs = [ final.makeWrapper ]; # buildInputs = [ final.makeWrapper ];
postBuild = '' # postBuild = ''
wrapProgram $out/bin/git --prefix PATH : ${ # wrapProgram $out/bin/git --prefix PATH : ${
lib.makeBinPath [ # lib.makeBinPath [
] # ]
} # }
''; # '';
}; # };
}) # })
]; # ];
}) # })
]; ];
} }