about summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2003-12-01T14·36+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2003-12-01T14·36+0000
commit5d2b424804ec93567ddf15639f84c4098d80f659 (patch)
tree20c27ca1669b8e694bf2f5c4592b8f58e99418b2 /scripts
parentdc05f29cf6e1c5ee557441951116ee3fb35e0e00 (diff)
* Use a system name that does not include the OS manufacturer (i.e.,
  "i686-linux" instead of "i686-suse-linux").

Diffstat (limited to 'scripts')
-rw-r--r--scripts/nix-prefetch-url.in2
-rw-r--r--scripts/nix-pull.in4
-rw-r--r--scripts/nix-push.in2
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/nix-prefetch-url.in b/scripts/nix-prefetch-url.in
index 0873f5a8d7cb..050955682122 100644
--- a/scripts/nix-prefetch-url.in
+++ b/scripts/nix-prefetch-url.in
@@ -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";
 
diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in
index 1453a46ac93d..ded4281cfbc0 100644
--- a/scripts/nix-pull.in
+++ b/scripts/nix-pull.in
@@ -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;
diff --git a/scripts/nix-push.in b/scripts/nix-push.in
index c1624d8355be..38afc7f748d7 100644
--- a/scripts/nix-push.in
+++ b/scripts/nix-push.in
@@ -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;
     }