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

Fix environment.etc setting

Browse Source 
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2014-01-15 15:15:16 -05:00
parent acaadd9d2a
commit babd66e8e6
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ config, pkgs, pkgs_i686, ... }: { config, pkgs, pkgs_i686, ... }:
let let
inherit (pkgs.lib) mkOption types mkIf optional optionals elem optionalString; inherit (pkgs.lib) mkOption types mkIf optional optionals elem optionalString optionalAttrs;
cfg = config.services.mesa; cfg = config.services.mesa;
@ -107,18 +107,11 @@ in {
boot.blacklistedKernelModules = boot.blacklistedKernelModules =
optionals (elem "nvidia" cfg.videoDrivers) [ "nouveau" "nvidiafb" ]; optionals (elem "nvidia" cfg.videoDrivers) [ "nouveau" "nvidiafb" ];
environment.etc = (optional (elem "ati_unfree" cfg.videoDrivers) [ environment.etc = (optionalAttrs (elem "ati_unfree" cfg.videoDrivers) {
# according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your "ati".source = "${kernelPackages.ati_drivers_x11}/etc/ati";
# life harder ;) Still it seems to be required })
{ source = "${kernelPackages.ati_drivers_x11}/etc/ati"; // (optionalAttrs (elem "nvidia" cfg.videoDrivers) {
target = "ati"; "OpenCL/vendors/nvidia.icd".source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
} });
])
++ (optional (elem "nvidia" cfg.videoDrivers) [
{ source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
target = "OpenCL/vendors/nvidia.icd";
}
]);
}; };
} }