diff options
| author | Nathaniel Baxter <nathaniel.baxter@gmail.com> | 2014-09-05 19:53:36 +1000 |
|---|---|---|
| committer | Nathaniel Baxter <nathaniel.baxter@gmail.com> | 2014-09-07 12:40:32 +1000 |
| commit | c16874c4c0e8f0980d1000b4024239146c02028d (patch) | |
| tree | fa5980b523740cd76d3b4751f9d7f8e92db04614 /nixos/modules/hardware/opengl.nix | |
| parent | 9a48f9d1b6656683c7450eecd839012ca424f556 (diff) | |
| download | nixpkgs-c16874c4c0e8f0980d1000b4024239146c02028d.tar nixpkgs-c16874c4c0e8f0980d1000b4024239146c02028d.tar.gz nixpkgs-c16874c4c0e8f0980d1000b4024239146c02028d.tar.bz2 nixpkgs-c16874c4c0e8f0980d1000b4024239146c02028d.tar.lz nixpkgs-c16874c4c0e8f0980d1000b4024239146c02028d.tar.xz nixpkgs-c16874c4c0e8f0980d1000b4024239146c02028d.tar.zst nixpkgs-c16874c4c0e8f0980d1000b4024239146c02028d.zip | |
ati_unfree: Create a nixos module for the ati_unfree x11 driver and
blacklist the radeon driver when ati_unfree is installed.
Diffstat (limited to 'nixos/modules/hardware/opengl.nix')
| -rw-r--r-- | nixos/modules/hardware/opengl.nix | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index f894c830eb6..f974ec01c66 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -104,22 +104,9 @@ in environment.sessionVariables.LD_LIBRARY_PATH = [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]; - # FIXME: move this into card-specific modules. - hardware.opengl.package = mkDefault - (if elem "ati_unfree" videoDrivers then - kernelPackages.ati_drivers_x11 - else - makePackage pkgs); - + hardware.opengl.package = mkDefault (makePackage pkgs); hardware.opengl.package32 = mkDefault (makePackage pkgs_i686); - boot.extraModulePackages = - optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions ++ - optional (elem "ati_unfree" videoDrivers) kernelPackages.ati_drivers_x11; - - environment.etc = - optionalAttrs (elem "ati_unfree" videoDrivers) { - "ati".source = "${kernelPackages.ati_drivers_x11}/etc/ati"; - }; + boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions; }; } |