diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-08-28 10:10:12 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-08-28 10:10:12 +0000 |
| commit | c4f1f49574b4fe55bef7952bd0fcc2bd626b0db2 (patch) | |
| tree | 9df5e55409a36163d5e5d39ac7fb9160cfb60053 | |
| parent | 31be53cd0a50ef9e3ddf64f79222e8e8dd1d05aa (diff) | |
* nix-push generated invalid (old-style) slices.
* nar.sh needs a path.
| -rw-r--r-- | corepkgs/nar/nar.sh.in | 2 | ||||
| -rw-r--r-- | scripts/nix-push.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/corepkgs/nar/nar.sh.in b/corepkgs/nar/nar.sh.in index d21668553..9f96b03ab 100644 --- a/corepkgs/nar/nar.sh.in +++ b/corepkgs/nar/nar.sh.in @@ -1,5 +1,7 @@ #! /bin/sh +export PATH=/bin:/usr/bin + echo "packing $path into $out..." mkdir $out || exit 1 tmp=$out/tmp diff --git a/scripts/nix-push.in b/scripts/nix-push.in index bb5e6da13..e51f903b8 100644 --- a/scripts/nix-push.in +++ b/scripts/nix-push.in @@ -52,7 +52,7 @@ foreach my $id (@ARGV) { # Construct a Fix expression that creates a Nix archive. my $fixexpr = "App(IncludeFix(\"nar/nar.fix\"), " . - "[ (\"path\", Slice([\"$pathid\"], [(\"$path\", \"$pathid\", [])]))" . + "[ (\"path\", Slice([\"$path\"], [(\"$path\", \"$pathid\", [])]))" . "])"; print FIX "," unless ($first); |