From d883483a0eac031292bad64e80d1a08636cba0a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Jan 2007 15:07:30 +0000
Subject: [PATCH] * Use paths-from-graph.pl.

svn path=/nixos/trunk/; revision=7776
---
 installer/nixos-installer.nix | 6 +++---
 installer/nixos-installer.sh  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/installer/nixos-installer.nix b/installer/nixos-installer.nix
index fd77c713c21d..ab1cd1d46277 100644
--- a/installer/nixos-installer.nix
+++ b/installer/nixos-installer.nix
@@ -1,4 +1,4 @@
-{ stdenv, runCommand, substituteAll, nix
+{ stdenv, perl, runCommand, substituteAll, nix
 , # URL of the Nixpkgs distribution that the installer will pull.
   # Leave empty for a pure source distribution.
   nixpkgsURL ? ""
@@ -8,9 +8,9 @@ substituteAll {
   src = ./nixos-installer.sh;
   dir = "bin";
   isExecutable = true;
-  inherit nix nixpkgsURL;
+  inherit nix nixpkgsURL perl;
 
-  pathsFromGraph = ../helpers/paths-from-graph.sh;
+  pathsFromGraph = ../helpers/paths-from-graph.pl;
 
   nixClosure = runCommand "closure"
     {exportReferencesGraph = ["refs" nix];}
diff --git a/installer/nixos-installer.sh b/installer/nixos-installer.sh
index 5e2601288131..16797ea6c324 100644
--- a/installer/nixos-installer.sh
+++ b/installer/nixos-installer.sh
@@ -54,7 +54,7 @@ mount --bind /sys $mountPoint/sys
 cleanup() {
     # !!! don't umount any we didn't mount ourselves
     for i in $(grep -F "$mountPoint" /proc/mounts \
-        | perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
+        | @perl@/bin/perl -e 'while (<>) { /^\S+\s+(\S+)\s+/; print "$1\n"; }' \
         | sort -r);
     do
         umount $i
@@ -83,7 +83,7 @@ mkdir -m 1777 -p \
 
 
 # Get the store paths to copy from the references graph.
-storePaths=$(@shell@ @pathsFromGraph@ @nixClosure@)
+storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
 
 # Copy Nix to the Nix store on the target device.
 echo "copying Nix to $mountPoint...."