eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-27 05:29:46 +01:00
Code Issues Releases Wiki Activity

home-environment: explicitly use coreutils

Browse source 
Before we used dirname and readlink from the ambient environment,
which caused problems when they don't behave as expected.

Fixes #3516

(cherry picked from commit d7eee202e5)
This commit is contained in:
Robert Helgesson 2022-12-23 22:40:33 +01:00
parent 2bfcc6be42
commit 2d5b55d23d
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/home-environment.nix
View file

@ -679,7 +679,6 @@ in
gnused gnused
ncurses # For `tput`. ncurses # For `tput`.
] ]
++ optional (config.nix.enable && config.nix.package != null) config.nix.package
++ config.home.extraActivationPath ++ config.home.extraActivationPath
) )
+ ( + (
@ -688,7 +687,7 @@ in
if config.nix.enable && config.nix.package != null then if config.nix.enable && config.nix.package != null then
":${config.nix.package}/bin" ":${config.nix.package}/bin"
else else
":$(dirname $(readlink -m $(type -p nix-env)))" ":$(${pkgs.coreutils}/bin/dirname $(${pkgs.coreutils}/bin/readlink -m $(type -p nix-env)))"
) )
+ optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH"; + optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH";