* This substitution causes bash to hang. Urgh. Bash's pattern
substitutions aren't very reliable. svn path=/nixpkgs/trunk/; revision=32830
This commit is contained in:
parent
0be4183bd5
commit
5e4c7aa8f3
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user