Author: eelco
Date: Tue Mar 6 18:49:44 2012
New Revision: 32830
URL: https://nixos.org/websvn/nix/?rev=32830&sc=1
Log:
* This substitution causes bash to hang. Urgh. Bash's pattern
substitutions aren't very reliable.
Modified:
nixpkgs/trunk/pkgs/build-support/vm/default.nix
Modified: nixpkgs/trunk/pkgs/build-support/vm/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/vm/default.nix Tue Mar 6 16:02:04
2012 (r32829)
+++ nixpkgs/trunk/pkgs/build-support/vm/default.nix Tue Mar 6 18:49:44
2012 (r32830)
@@ -348,6 +348,7 @@
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 @@
'';
});
+
extractMTDfs = {file, fs ? null} :
with pkgs; runInLinuxVM (
stdenv.mkDerivation {
@@ -399,6 +401,7 @@
'';
});
+
qemuCommandGeneric = ''
${kvm}/bin/qemu-system-x86_64 \
-nographic -no-reboot \
@@ -755,7 +758,7 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
