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

Global replace /var/run/opengl-driver -> /run/opengl-driver

Browse Source
This commit is contained in:
Eelco Dolstra 2012-07-16 11:32:26 -04:00
parent 98459eb675
commit 1d57489427
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/services/x11/xserver.nix
View File

@ -407,21 +407,21 @@ in
preStart = preStart =
'' ''
rm -f /var/run/opengl-driver rm -f /run/opengl-driver
rm -f /var/run/opengl-driver-32 rm -f /run/opengl-driver-32
${# !!! The OpenGL driver depends on what's detected at runtime. ${# !!! The OpenGL driver depends on what's detected at runtime.
if elem "nvidia" driverNames then if elem "nvidia" driverNames then
'' ''
ln -sf ${kernelPackages.nvidia_x11} /var/run/opengl-driver ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit) ${optionalString (pkgs.stdenv.system == "x86_64-linux" && cfg.driSupport32Bit)
"ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /var/run/opengl-driver-32"} "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
'' ''
else if elem "nvidiaLegacy96" driverNames then else if elem "nvidiaLegacy96" driverNames then
"ln -sf ${kernelPackages.nvidia_x11_legacy96} /var/run/opengl-driver" "ln -sf ${kernelPackages.nvidia_x11_legacy96} /run/opengl-driver"
else if elem "nvidiaLegacy173" driverNames then else if elem "nvidiaLegacy173" driverNames then
"ln -sf ${kernelPackages.nvidia_x11_legacy173} /var/run/opengl-driver" "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
else if cfg.driSupport then else if cfg.driSupport then
"ln -sf ${pkgs.mesa} /var/run/opengl-driver" "ln -sf ${pkgs.mesa} /run/opengl-driver"
else "" else ""
} }