diff --git a/installer/cd-dvd/live-dvd-X-medium.nix b/installer/cd-dvd/live-dvd-X-medium.nix
index ec0089ded56..db57921b4c5 100644
--- a/installer/cd-dvd/live-dvd-X-medium.nix
+++ b/installer/cd-dvd/live-dvd-X-medium.nix
@@ -22,7 +22,7 @@ let
 in 
 (isoFun (rec {
 	inherit platform;
-	lib = (import ../pkgs/lib);
+	lib = (import ../../pkgs/lib);
 
 	networkNixpkgs = "";
 	manualEnabled = true;
@@ -171,40 +171,40 @@ in
 	configList = configuration : [
 	{
 		suffix = "X-vesa";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with vesa";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with vesa";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "vesa";};
 			};
 		});
 	}
 	{
 		suffix = "X-Intel";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
 			};
 		});
 	}
 	{
 		suffix = "X-ATI";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
 			};
 		});
 	}
         {
                 suffix = "X-NVIDIA";
-                configuration = (configuration //
+		configuration = args: ((configuration args) // 
                 {
-                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = configuration.services // {
+                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = (configuration args).services // {
                                 xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
                         };
                 });
diff --git a/installer/cd-dvd/live-dvd-X-no-soft.nix b/installer/cd-dvd/live-dvd-X-no-soft.nix
index 7111107b675..62ebf683d09 100644
--- a/installer/cd-dvd/live-dvd-X-no-soft.nix
+++ b/installer/cd-dvd/live-dvd-X-no-soft.nix
@@ -18,7 +18,6 @@ let
 	windowManager = "twm";
 	tty = "9";
   };
-  pkgs
 
 in 
 (isoFun {
@@ -80,40 +79,40 @@ in
 	configList = configuration : [
 	{
 		suffix = "X-vesa";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with vesa";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with vesa";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "vesa";};
 			};
 		});
 	}
 	{
 		suffix = "X-Intel";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
 			};
 		});
 	}
 	{
 		suffix = "X-ATI";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
 			};
 		});
 	}
         {
                 suffix = "X-NVIDIA";
-                configuration = (configuration //
+		configuration = args: ((configuration args) // 
                 {
-                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = configuration.services // {
+                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = (configuration args).services // {
                                 xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
                         };
                 });
diff --git a/installer/cd-dvd/live-dvd-X.nix b/installer/cd-dvd/live-dvd-X.nix
index e9b3c2df2eb..c98b398a9af 100644
--- a/installer/cd-dvd/live-dvd-X.nix
+++ b/installer/cd-dvd/live-dvd-X.nix
@@ -20,9 +20,9 @@ let
   };
 
 in 
-(isoFun {
+(isoFun (rec {
 	inherit platform;
-	lib = (import ../pkgs/lib);
+	lib = (import ../../pkgs/lib);
 
 	networkNixpkgs = "";
 	manualEnabled = true;
@@ -182,43 +182,43 @@ in
 	configList = configuration : [
 	{
 		suffix = "X-vesa";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with vesa";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with vesa";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "vesa";};
 			};
 		});
 	}
 	{
 		suffix = "X-Intel";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with Intel graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with Intel graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "intel"; driSupport = true;};
 			};
 		});
 	}
 	{
 		suffix = "X-ATI";
-		configuration = (configuration // 
+		configuration = args: ((configuration args) // 
 		{
-			boot=configuration.boot // {configurationName = "X with ATI graphic card";};
-			services = configuration.services // {
+			boot=(configuration args).boot // {configurationName = "X with ATI graphic card";};
+			services = (configuration args).services // {
 				xserver = xConfiguration // {videoDriver = "ati"; driSupport = true;};
 			};
 		});
 	}
         {
                 suffix = "X-NVIDIA";
-                configuration = (configuration //
+		configuration = args: ((configuration args) // 
                 {
-                        boot=configuration.boot // {configurationName = "X with NVIDIA graphic card";};
-                        services = configuration.services // {
+                        boot=(configuration args).boot // {configurationName = "X with NVIDIA graphic card";};
+                        services = (configuration args).services // {
                                 xserver = xConfiguration // {videoDriver = "nvidia"; driSupport = true;};
                         };
                 });
         }
 	];
-}).rescueCD
+})).rescueCD