call-machine: Don't patch iso-image.nix anymore

This reverts commit 3bf7b0dc9d087d7c141f317456e7abdd60ceda2a.

Since NixOS/nixpkgs@269f261 there is a separate "nomodeset" boot menu
option, so we no longer need this workaround.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 7 insertions, 12 deletions

diff --git a/lib/call-machine.nix b/lib/call-machine.nix
index 30ef8bdf..95539114 100644
--- a/lib/call-machine.nix
+++ b/lib/call-machine.nix
@@ -10,20 +10,15 @@ let
 
   iso = let
     isoModule = "${nixpkgs}/nixos/modules/installer/cd-dvd/iso-image.nix";
-    patchedModule = (import nixpkgs {}).runCommand "iso-image.nix" {} ''
-      sed -e 's|../../../lib/|${nixpkgs}/nixos/lib/|g' \
-          -e 's/"nomodeset"//g' \
-          "${isoModule}" > "$out"
-    '';
     wrapIso = { config, pkgs, lib, ... }@attrs: let
-      patchedEval = (import patchedModule attrs);
-      patchedEvalcfg = patchedEval.config or {};
-      bootcfg = patchedEvalcfg.boot or {};
-      fscfg = patchedEvalcfg.fileSystems or {};
+      isoEval = (import isoModule attrs);
+      isoEvalcfg = isoEval.config or {};
+      bootcfg = isoEvalcfg.boot or {};
+      fscfg = isoEvalcfg.fileSystems or {};
     in {
-      options = patchedEval.options or {};
-      imports = patchedEval.imports or [];
-      config = patchedEvalcfg // {
+      options = isoEval.options or {};
+      imports = isoEval.imports or [];
+      config = isoEvalcfg // {
         boot = bootcfg // lib.optionalAttrs (bootcfg ? loader) {
           loader = lib.mkForce bootcfg.loader;
         };