Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

go: use attribute set to define files

Browse source 
To avoid warning message concerning deprecation of the `loaOf` type.
This commit is contained in:
Robert Helgesson 2020-01-11 19:36:24 +01:00
parent 8ace1ab1b0
commit e857249d86
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/programs/go.nix
View file

@ -77,14 +77,11 @@ in
home.file = home.file =
let let
goPath = if cfg.goPath != null then cfg.goPath else "go"; goPath = if cfg.goPath != null then cfg.goPath else "go";
mkSrc = n: v: { "${goPath}/src/${n}".source = v; };
mkSrc = n: v: {
target = "${goPath}/src/${n}";
source = v;
};
in in
mapAttrsToList mkSrc cfg.packages; foldl' (a: b: a // b) {} (mapAttrsToList mkSrc cfg.packages);
} }
(mkIf (cfg.goPath != null) { (mkIf (cfg.goPath != null) {
home.sessionVariables.GOPATH = home.sessionVariables.GOPATH =
concatStringsSep ":" concatStringsSep ":"
@ -92,6 +89,7 @@ in
(map (path: "${config.home.homeDirectory}/${path}") (map (path: "${config.home.homeDirectory}/${path}")
([cfg.goPath] ++ cfg.extraGoPaths))); ([cfg.goPath] ++ cfg.extraGoPaths)));
}) })
(mkIf (cfg.goBin != null) { (mkIf (cfg.goBin != null) {
home.sessionVariables.GOBIN = builtins.toPath "${config.home.homeDirectory}/${cfg.goBin}"; home.sessionVariables.GOBIN = builtins.toPath "${config.home.homeDirectory}/${cfg.goBin}";
}) })