mirror of
https://github.com/NixOS/nix
synced 2025-07-01 12:37:59 +02:00
* Switched from wget to curl.
* Made the dependencies on bzip2 and the shell explicit.
This commit is contained in:
parent
59b94ee18a
commit
03f1d1ecb5
11 changed files with 47 additions and 36 deletions
|
@ -10,7 +10,7 @@ print "fetching $url...\n";
|
|||
|
||||
my $out = "@storedir@/nix-prefetch-url-$$";
|
||||
|
||||
system "@wget@ --passive-ftp '$url' -O '$out'";
|
||||
system "@curl@ --fail --location --max-redirs 20 \"$url\" > \"$out\"";
|
||||
$? == 0 or die "unable to fetch $url";
|
||||
|
||||
my $hash=`@bindir@/nix-hash --flat $out`;
|
||||
|
@ -27,11 +27,12 @@ my $nixexpr =
|
|||
"(import @datadir@/nix/corepkgs/fetchurl) " .
|
||||
"{url = $url; md5 = \"$hash\"; system = \"@system@\";}";
|
||||
|
||||
print "expr: $nixexpr\n";
|
||||
#print STDERR "expr: $nixexpr\n";
|
||||
|
||||
# Instantiate a Nix expression.
|
||||
print STDERR "instantiating Nix expression...\n";
|
||||
my $pid = open2(\*READ, \*WRITE, "nix-instantiate -") or die "cannot run nix-instantiate";
|
||||
#print STDERR "instantiating Nix expression...\n";
|
||||
my $pid = open2(\*READ, \*WRITE, "@bindir@/nix-instantiate -")
|
||||
or die "cannot run nix-instantiate";
|
||||
|
||||
print WRITE $nixexpr;
|
||||
close WRITE;
|
||||
|
@ -43,8 +44,13 @@ waitpid $pid, 0;
|
|||
$? == 0 or die "nix-instantiate failed";
|
||||
|
||||
# Run Nix.
|
||||
print STDERR "realising store expression $drvpath...\n";
|
||||
system "nix-store --realise $drvpath > /dev/null";
|
||||
#print STDERR "realising store expression $drvpath...\n";
|
||||
system "@bindir@/nix-store --realise $drvpath > /dev/null";
|
||||
$? == 0 or die "realisation failed";
|
||||
|
||||
my $path = `@bindir@/nix-store -qn $drvpath`;
|
||||
$? == 0 or die "query failed";
|
||||
|
||||
print "path is $path";
|
||||
|
||||
unlink $out2;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue