From c4f1f49574b4fe55bef7952bd0fcc2bd626b0db2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 28 Aug 2003 10:10:12 +0000 Subject: [PATCH] * nix-push generated invalid (old-style) slices. * nar.sh needs a path. --- corepkgs/nar/nar.sh.in | 2 ++ scripts/nix-push.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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);