mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 00:08:07 +02:00
* Use $(storedir) instead of $(prefix)/store.
This commit is contained in:
parent
dbf547645d
commit
7f0ed370da
3 changed files with 4 additions and 3 deletions
|
@ -4,7 +4,7 @@ use strict;
|
|||
use IPC::Open2;
|
||||
|
||||
my $linkdir = "@localstatedir@/nix/profiles";
|
||||
my $storedir = "@prefix@/store";
|
||||
my $storedir = "@storedir@";
|
||||
|
||||
my %alive;
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ defined $url or die;
|
|||
|
||||
print "fetching $url...\n";
|
||||
|
||||
my $out = "@prefix@/store/nix-prefetch-url-$$";
|
||||
my $out = "@storedir@/nix-prefetch-url-$$";
|
||||
|
||||
system "@wget@ --passive-ftp '$url' -O '$out'";
|
||||
$? == 0 or die "unable to fetch $url";
|
||||
|
@ -19,7 +19,7 @@ chomp $hash;
|
|||
|
||||
print "file has hash $hash\n";
|
||||
|
||||
my $out2 = "@prefix@/store/nix-prefetch-url-$hash";
|
||||
my $out2 = "@storedir@/nix-prefetch-url-$hash";
|
||||
rename $out, $out2;
|
||||
|
||||
# Create a Nix expression.
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
-e "s^@localstatedir\@^$(localstatedir)^g" \
|
||||
-e "s^@datadir\@^$(datadir)^g" \
|
||||
-e "s^@libexecdir\@^$(libexecdir)^g" \
|
||||
-e "s^@storedir\@^$(storedir)^g" \
|
||||
-e "s^@system\@^$(system)^g" \
|
||||
-e "s^@wget\@^$(wget)^g" \
|
||||
-e "s^@version\@^$(VERSION)^g" \
|
||||
|
|
Loading…
Reference in a new issue