From f088152737106c49b96375253a430928f424b03a Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 3 May 2016 02:43:01 +0200 Subject: lib/call-machine: Shorten line lengths No changes of functionality, but having paths with a common ancestor that flood the horizontal space isn't really nice to view side-by-side. Signed-off-by: aszlig --- lib/call-machine.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/call-machine.nix b/lib/call-machine.nix index 5ab0ba0f..ba38b40c 100644 --- a/lib/call-machine.nix +++ b/lib/call-machine.nix @@ -7,7 +7,7 @@ let modules = [ path cfg ] ++ import ../modules/module-list.nix; }; - iso = mkIso "${nixpkgs}/nixos/modules/installer/cd-dvd/iso-image.nix" ( + iso = mkIso "installer/cd-dvd/iso-image.nix" ( { lib, ... }: let name = eval.config.networking.hostName; upperName = lib.toUpper name; @@ -20,7 +20,7 @@ let } ); - installerIso = mkIso "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" { + installerIso = mkIso "installer/cd-dvd/installation-cd-minimal.nix" { environment.sessionVariables = { NIX_PATH = [ "vuizvui=${../.}" ]; }; @@ -28,7 +28,7 @@ let mkIso = isoModule: extraConfig: let wrapIso = { config, pkgs, lib, ... }@attrs: let - isoEval = import isoModule attrs; + isoEval = import "${nixpkgs}/nixos/modules/${isoModule}" attrs; isoEvalcfg = isoEval.config or {}; bootcfg = isoEvalcfg.boot or {}; fscfg = isoEvalcfg.fileSystems or {}; -- cgit 1.4.1