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

Updating LiveDVD with X expressions

Browse Source 
svn path=/nixos/trunk/; revision=14251
This commit is contained in:
Michael Raskin 2009-02-25 21:15:35 +00:00
parent d01a495de4
commit f767f1bea8
3 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
installer/cd-dvd/live-dvd-X-medium.nix
View File

@ -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;};
};
});

25
installer/cd-dvd/live-dvd-X-no-soft.nix
View File

@ -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;};
};
});

30
installer/cd-dvd/live-dvd-X.nix
View File

@ -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