mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Use a system name that does not include the OS manufacturer (i.e.,

Browse source 
"i686-linux" instead of "i686-suse-linux").
This commit is contained in:
Eelco Dolstra 2003-12-01 14:36:50 +00:00
parent dc05f29cf6
commit 5d2b424804
7 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/nix-prefetch-url.in
View file

@ -25,7 +25,7 @@ rename $out, $out2;
# Create a Nix expression.
my $nixexpr =
"(import @datadir@/nix/corepkgs/fetchurl) " .
"{url = $url; md5 = \"$hash\"; system = \"@host@\"}";
"{url = $url; md5 = \"$hash\"; system = \"@system@\"}";
print "expr: $nixexpr\n";

4
scripts/nix-pull.in
View file

@ -61,10 +61,10 @@ sub processURL {
# Nix archive from the network.
my $fetch =
"(import @datadir@/nix/corepkgs/fetchurl) " .
"{url = $fullurl; md5 = \"$hash\"; system = \"@host@\"}";
"{url = $fullurl; md5 = \"$hash\"; system = \"@system@\"}";
my $nixexpr =
"((import @datadir@/nix/corepkgs/nar/unnar.nix) " .
"{narFile = ($fetch); outPath = \"$storepath\"; system = \"@host@\"}) ";
"{narFile = ($fetch); outPath = \"$storepath\"; system = \"@system@\"}) ";
$fullexpr .= $nixexpr; # !!! O(n^2)?
push @srcpaths, $storepath;

2
scripts/nix-push.in
View file

@ -45,7 +45,7 @@ foreach my $id (@ARGV) {
my $nixexpr =
"((import @datadir@/nix/corepkgs/nar/nar.nix) " .
# !!! $path should be represented as a closure
"{path = \"$path\"; system = \"@host@\"}) ";
"{path = \"$path\"; system = \"@system@\"}) ";
print NIX $nixexpr;
}