mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-06 00:37:00 +00:00
Code Activity

Merge pull request #1277 from emilazy/push-yxsrvorpzlor

Browse source 
{environment,nix-tools}: correct default `$PATH` ordering to match macOS
This commit is contained in:
Emily 2025-01-18 01:11:06 +00:00 • committed by GitHub
commit 3924b55553
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/environment/default.nix
View file

@ -161,7 +161,7 @@ in
environment.systemPath = mkMerge [ environment.systemPath = mkMerge [
[ (makeBinPath cfg.profiles) ] [ (makeBinPath cfg.profiles) ]
(mkOrder 1200 [ "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin" ]) (mkOrder 1200 [ "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" ])
]; ];
# Use user, default and system profiles. # Use user, default and system profiles.

2
pkgs/nix-tools/default.nix
View file

@ -6,7 +6,7 @@
, stdenv , stdenv
, profile ? "/nix/var/nix/profiles/system" , profile ? "/nix/var/nix/profiles/system"
, nixPackage ? "/nix/var/nix/profiles/default" , nixPackage ? "/nix/var/nix/profiles/default"
, systemPath ? "$HOME/.nix-profile/bin:/etc/profiles/per-user/$USER/bin:/run/current-system/sw/bin:/nix/var/nix/profiles/default/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin" , systemPath ? "$HOME/.nix-profile/bin:/etc/profiles/per-user/$USER/bin:/run/current-system/sw/bin:/nix/var/nix/profiles/default/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
}: }:
let let

2
tests/environment-path.nix
View file

@ -30,8 +30,8 @@ with lib;
"afterProfile/bin" "afterProfile/bin"
"/usr/local/bin" "/usr/local/bin"
"/usr/bin" "/usr/bin"
"/usr/sbin"
"/bin" "/bin"
"/usr/sbin"
"/sbin" "/sbin"
"afterPath" "afterPath"
]}" ]}"