diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/nix-collect-garbage.in | 4 | ||||
| -rw-r--r-- | scripts/nix-profile.sh.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/nix-collect-garbage.in b/scripts/nix-collect-garbage.in index d0552fd2f6..1effc14d67 100755 --- a/scripts/nix-collect-garbage.in +++ b/scripts/nix-collect-garbage.in @@ -3,7 +3,7 @@ use strict; use IPC::Open2; -my $linkdir = "@localstatedir@/nix/links"; +my $linkdir = "@localstatedir@/nix/profiles"; my $storedir = "@prefix@/store"; my %alive; @@ -24,7 +24,7 @@ closedir DIR; my @roots; foreach my $link (@links) { $link = $linkdir . "/" . $link; - next if (!($link =~ /.id$/)); + next if (!($link =~ /.gcroot$/)); open ROOT, "<$link" or die "cannot open $link: $!"; my $root = <ROOT>; chomp $root; diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in index 55cff3e62d..7f19f80148 100644 --- a/scripts/nix-profile.sh.in +++ b/scripts/nix-profile.sh.in @@ -1,9 +1,9 @@ if test -n "$HOME"; then - NIX_LINK="$HOME/.nix-userenv" + NIX_LINK="$HOME/.nix-profile" if ! test -L "$NIX_LINK"; then echo "creating $NIX_LINK" - _NIX_DEF_LINK=@localstatedir@/nix/links/current + _NIX_DEF_LINK=@localstatedir@/nix/profiles/default ln -s "$_NIX_DEF_LINK" "$NIX_LINK" fi |