From dd42dd480b8e3b6895d0abbce9dd0e9cd7632a23 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 15 May 2013 01:15:16 -0400 Subject: [PATCH] runInLinuxImage: Fix derivation overriding. 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 --- pkgs/build-support/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index fac85c162e8..b1eb82ed830 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -445,7 +445,7 @@ rec { etc. from the specified filesystem image, which typically is a filesystem containing a non-NixOS Linux distribution. */ - runInLinuxImage = attrs: runInLinuxVM (attrs // { + runInLinuxImage = drv: runInLinuxVM (lib.overrideDerivation drv (attrs: { mountDisk = true; /* 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. */ fixupPhase = "true"; - }); + })); /* Create a filesystem image of the specified size and fill it with