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

* nvidiaDrivers -> nvidia_x11.

Browse Source 
svn path=/nixos/trunk/; revision=14788
This commit is contained in:
Eelco Dolstra 2009-03-30 14:54:22 +00:00
parent 40f38560d4
commit ccbcf58062
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system/options.nix
View File

@ -99,7 +99,7 @@ in
Additional attributes may be needed depending on your Additional attributes may be needed depending on your
configuration. For instance, if you use the NVIDIA X driver, configuration. For instance, if you use the NVIDIA X driver,
then it also needs to contain an attribute then it also needs to contain an attribute
<varname>nvidiaDrivers</varname>. <varname>nvidia_x11</varname>.
"; ";
}; };
@ -152,7 +152,7 @@ in
extraModulePackages = mkOption { extraModulePackages = mkOption {
default = []; default = [];
# !!! example = [pkgs.aufs pkgs.nvidiaDrivers]; # !!! example = [pkgs.aufs pkgs.nvidia_x11];
description = '' description = ''
A list of additional packages supplying kernel modules. A list of additional packages supplying kernel modules.
''; '';

2
system/system.nix
View File

@ -46,7 +46,7 @@ rec {
# Merged into mainline kernel # Merged into mainline kernel
# ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi # ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
# !!! this should be declared by the xserver Upstart job. # !!! this should be declared by the xserver Upstart job.
++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidia_x11
++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007 ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
++ config.boot.extraModulePackages ++ config.boot.extraModulePackages
); );

9
upstart-jobs/xserver.nix
View File

@ -14,7 +14,7 @@ let
stdenv = pkgs.stdenv; stdenv = pkgs.stdenv;
knownVideoDrivers = { knownVideoDrivers = {
nvidia = { modulesFirst = [ kernelPackages.nvidiaDrivers ]; }; #make sure it first loads the nvidia libs nvidia = { modulesFirst = [ kernelPackages.nvidia_x11 ]; }; #make sure it first loads the nvidia libs
vesa = { modules = [xorg.xf86videovesa]; }; vesa = { modules = [xorg.xf86videovesa]; };
vga = { modules = [xorg.xf86videovga]; }; vga = { modules = [xorg.xf86videovga]; };
sis = { modules = [xorg.xf86videosis]; }; sis = { modules = [xorg.xf86videosis]; };
@ -351,7 +351,6 @@ let
}; };
in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme; in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;
nvidiaDrivers = (config.boot.kernelPackages pkgs).nvidiaDrivers;
in in
@ -401,7 +400,7 @@ rec {
xorg.xset # used by startkde, non-essential xorg.xset # used by startkde, non-essential
] ]
++ optional (videoDriver == "nvidia") [ ++ optional (videoDriver == "nvidia") [
kernelPackages.nvidiaDrivers kernelPackages.nvidia_x11
]; ];
@ -425,7 +424,7 @@ rec {
rm -f /var/run/opengl-driver rm -f /var/run/opengl-driver
${if videoDriver == "nvidia" ${if videoDriver == "nvidia"
then '' then ''
ln -sf ${kernelPackages.nvidiaDrivers} /var/run/opengl-driver ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver
'' ''
else if cfg.driSupport else if cfg.driSupport
then "ln -sf ${pkgs.mesa} /var/run/opengl-driver" then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
@ -444,7 +443,7 @@ rec {
env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension. env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
${if videoDriver == "nvidia" ${if videoDriver == "nvidia"
then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidiaDrivers}/lib" then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib"
else "" else ""
} }