From 5e4c7aa8f31351c8b34ce94ffc6da0fe8278cb10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Mar 2012 18:49:44 +0000
Subject: [PATCH] * This substitution causes bash to hang.  Urgh.  Bash's
 pattern   substitutions aren't very reliable.

svn path=/nixpkgs/trunk/; revision=32830
---
 pkgs/build-support/vm/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index eaea4d190f19..1d1f6b435ec5 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -348,6 +348,7 @@ rec {
     QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
   });
 
+  
   extractFs = {file, fs ? null} :
     with pkgs; runInLinuxVM (
     stdenv.mkDerivation {
@@ -373,6 +374,7 @@ rec {
       '';
     });
 
+    
   extractMTDfs = {file, fs ? null} :
     with pkgs; runInLinuxVM (
     stdenv.mkDerivation {
@@ -399,6 +401,7 @@ rec {
       '';
     });
 
+    
   qemuCommandGeneric = ''
     ${kvm}/bin/qemu-system-x86_64 \
       -nographic -no-reboot \
@@ -755,7 +758,7 @@ rec {
       bunzip2 < ${packagesList} > ./Packages
 
       # Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279
-      substituteInPlace ./Packages --replace x86_64-linux-gnu x86-64-linux-gnu
+      sed -i ./Packages -e s/x86_64-linux-gnu/x86-64-linux-gnu/g
 
       ${perl}/bin/perl -I${dpkg} -w ${deb/deb-closure.pl} \
         ./Packages ${urlPrefix} ${toString packages} > $out