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

nixos/mesa: don't create /run/opengl-driver-32 ...

Browse Source 
... if on 64-bit and without 32-bit drivers.
Also assert against requesting 32-bit drivers on 32-bit machine.
This commit is contained in:
Vladimír Čunát 2014-02-05 19:16:15 +01:00
parent a123a2675b
commit 4284694439
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/x11/mesa.nix
View File

@ -61,13 +61,18 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = pkgs.lib.singleton {
assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64;
message = "Option driSupport32Bit only makes sens on a 64-bit system.";
};
system.activationScripts.setup-opengl.deps = []; system.activationScripts.setup-opengl.deps = [];
system.activationScripts.setup-opengl.text = '' system.activationScripts.setup-opengl.text = ''
rm -f /run/opengl-driver{,-32} rm -f /run/opengl-driver{,-32}
${optionalString (!cfg.driSupport32Bit) "ln -sf opengl-driver /run/opengl-driver-32"} ${optionalString (pkgs.stdenv.isi686) "ln -sf opengl-driver /run/opengl-driver-32"}
''
${# !!! The OpenGL driver depends on what's detected at runtime. #TODO: The OpenGL driver should depend on what's detected at runtime.
if elem "nvidia" cfg.videoDrivers then +( if elem "nvidia" cfg.videoDrivers then
'' ''
ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
${optionalString cfg.driSupport32Bit ${optionalString cfg.driSupport32Bit
@ -89,8 +94,7 @@ in {
${optionalString cfg.driSupport32Bit ${optionalString cfg.driSupport32Bit
"ln -sf ${pkgs_i686.mesa_drivers} /run/opengl-driver-32"} "ln -sf ${pkgs_i686.mesa_drivers} /run/opengl-driver-32"}
'' ''
} );
'';
environment.variables.LD_LIBRARY_PATH = environment.variables.LD_LIBRARY_PATH =
[ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ] [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]