mirror of
https://github.com/nix-community/home-manager
synced 2024-11-23 11:39:46 +01:00
home-environment: explicitly use coreutils
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:
parent
2bfcc6be42
commit
2d5b55d23d
1 changed files with 1 additions and 2 deletions
|
@ -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";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue