JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* This substitution causes bash to hang. Urgh. Bash's pattern

Browse Source 
substitutions aren't very reliable.

svn path=/nixpkgs/trunk/; revision=32830
This commit is contained in:
Eelco Dolstra 2012-03-06 18:49:44 +00:00
parent 0be4183bd5
commit 5e4c7aa8f3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/vm/default.nix
View File

@ -348,6 +348,7 @@ rec {
QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}"; QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
}); });
extractFs = {file, fs ? null} : extractFs = {file, fs ? null} :
with pkgs; runInLinuxVM ( with pkgs; runInLinuxVM (
stdenv.mkDerivation { stdenv.mkDerivation {
@ -373,6 +374,7 @@ rec {
''; '';
}); });
extractMTDfs = {file, fs ? null} : extractMTDfs = {file, fs ? null} :
with pkgs; runInLinuxVM ( with pkgs; runInLinuxVM (
stdenv.mkDerivation { stdenv.mkDerivation {
@ -399,6 +401,7 @@ rec {
''; '';
}); });
qemuCommandGeneric = '' qemuCommandGeneric = ''
${kvm}/bin/qemu-system-x86_64 \ ${kvm}/bin/qemu-system-x86_64 \
-nographic -no-reboot \ -nographic -no-reboot \
@ -755,7 +758,7 @@ rec {
bunzip2 < ${packagesList} > ./Packages bunzip2 < ${packagesList} > ./Packages
# Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279 # 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} \ ${perl}/bin/perl -I${dpkg} -w ${deb/deb-closure.pl} \
./Packages ${urlPrefix} ${toString packages} > $out ./Packages ${urlPrefix} ${toString packages} > $out