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

runInLinuxImage: Fix derivation overriding.

Browse Source 
This only ever worked because runInLinuxVM happened to call
overrideDerivation, which itself erroneously passed arbitrarily-added
attributes to the new call to derivation.

Hopefully this time Eelco won't have to revert my change ;)

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-05-15 01:15:16 -04:00
parent 03b6fe7422
commit dd42dd480b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,7 +445,7 @@ rec {
etc. from the specified filesystem image, which typically is a etc. from the specified filesystem image, which typically is a
filesystem containing a non-NixOS Linux distribution. */ filesystem containing a non-NixOS Linux distribution. */
runInLinuxImage = attrs: runInLinuxVM (attrs // { runInLinuxImage = drv: runInLinuxVM (lib.overrideDerivation drv (attrs: {
mountDisk = true; mountDisk = true;
/* Mount `image' as the root FS, but use a temporary copy-on-write /* Mount `image' as the root FS, but use a temporary copy-on-write
@ -470,7 +470,7 @@ rec {
/* Don't run Nix-specific build steps like patchelf. */ /* Don't run Nix-specific build steps like patchelf. */
fixupPhase = "true"; fixupPhase = "true";
}); }));
/* Create a filesystem image of the specified size and fill it with /* Create a filesystem image of the specified size and fill it with