From babd66e8e67e5e50d5b507b338adb04e6a58d929 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 15 Jan 2014 15:15:16 -0500
Subject: [PATCH] Fix environment.etc setting

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 nixos/modules/services/x11/mesa.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/x11/mesa.nix b/nixos/modules/services/x11/mesa.nix
index f3e24bac816..f892a151758 100644
--- a/nixos/modules/services/x11/mesa.nix
+++ b/nixos/modules/services/x11/mesa.nix
@@ -1,6 +1,6 @@
 { config, pkgs, pkgs_i686, ... }:
 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;
 
@@ -107,18 +107,11 @@ in {
     boot.blacklistedKernelModules =
       optionals (elem "nvidia" cfg.videoDrivers) [ "nouveau" "nvidiafb" ];
 
-    environment.etc =  (optional (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
-          # life harder ;) Still it seems to be required
-          { source = "${kernelPackages.ati_drivers_x11}/etc/ati";
-            target = "ati";
-          }
-      ])
-      ++ (optional (elem "nvidia" cfg.videoDrivers) [
-
-          { source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
-            target = "OpenCL/vendors/nvidia.icd";
-          }
-      ]);
+    environment.etc =  (optionalAttrs (elem "ati_unfree" cfg.videoDrivers) {
+        "ati".source = "${kernelPackages.ati_drivers_x11}/etc/ati";
+      })
+      // (optionalAttrs (elem "nvidia" cfg.videoDrivers) {
+        "OpenCL/vendors/nvidia.icd".source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
+      });
   };
 }