diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-16 17:27:11 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-16 17:27:11 -0400 |
| commit | 44d091674bce1f5ff783e8773bfb4abc0f2cd04c (patch) | |
| tree | 20ae4160c8b944c99dfb3f84816ea0946c6cee3d /modules/services/x11/xserver.nix | |
| parent | bf15293b1efc4eda36e535cec043ba4fdace9b44 (diff) | |
| parent | 1d5748942771c6d39df0030e36819b47002d460a (diff) | |
| download | nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar.gz nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar.bz2 nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar.lz nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar.xz nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.tar.zst nixlib-44d091674bce1f5ff783e8773bfb4abc0f2cd04c.zip | |
Merge branch 'master' of github.com:NixOS/nixos into systemd
Conflicts: modules/config/networking.nix modules/services/networking/ssh/sshd.nix modules/services/ttys/agetty.nix modules/system/boot/stage-2-init.sh modules/system/upstart-events/shutdown.nix
Diffstat (limited to 'modules/services/x11/xserver.nix')
| -rw-r--r-- | modules/services/x11/xserver.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index 61af0459a6bd..5d795e5d57dc 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -405,21 +405,21 @@ in preStart = '' - rm -f /var/run/opengl-driver - rm -f /var/run/opengl-driver-32 + rm -f /run/opengl-driver + rm -f /run/opengl-driver-32 ${# !!! The OpenGL driver depends on what's detected at runtime. 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) - "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 - "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 - "ln -sf ${kernelPackages.nvidia_x11_legacy173} /var/run/opengl-driver" + "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver" else if cfg.driSupport then - "ln -sf ${pkgs.mesa} /var/run/opengl-driver" + "ln -sf ${pkgs.mesa} /run/opengl-driver" else "" } |