From 8e8554242f5bada7e506663670a245756fe1f321 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 16 Apr 2010 05:09:10 +0000
Subject: [PATCH] Remove extraLinkPaths, thanks to Pierron for explanation

Now pathsToLink=["/include"] in configuration.nix will add /include instead of overwriting.

svn path=/nixos/trunk/; revision=21111
---
 modules/config/system-path.nix                  | 17 +++++------------
 .../x11/desktop-managers/kde-environment.nix    |  4 ++--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index e085ef2acb3e..82b4c1e582b8 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -7,6 +7,7 @@ with pkgs.lib;
 
 let
 
+  cfg = config.environment;
   requiredPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
       config.system.sbin.mount # must take precedence over util-linux
@@ -79,27 +80,18 @@ let
       pathsToLink = mkOption {
         # Note: We need `/lib' to be among `pathsToLink' for NSS modules
         # to work.
-        default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
+        default = [];
         example = ["/"];
         description = "
           Lists directories to be symlinked in `/var/run/current-system/sw'.
-          Use extraLinkPaths if you want just to add some additional paths.
         ";
       };
-
-      extraLinkPaths = mkOption {
-          default = [];
-          example = ["/"];
-          description = "
-            Extra directories to be symlinked in /var/run/current-system/sw.
-          ";
-      };
     };
 
     system = {
 
       path = mkOption {
-        default = config.environment.systemPackages;
+        default = cfg.systemPackages;
         description = ''
           The packages you want in the boot environment.
         '';
@@ -107,7 +99,7 @@ let
           name = "system-path";
           paths = list;
 
-          pathsToLink = with config.environment; pathsToLink ++ extraLinkPaths;
+          inherit (cfg) pathsToLink;
 
           ignoreCollisions = true;
         };
@@ -124,4 +116,5 @@ in
   require = [options];
 
   environment.systemPackages = requiredPackages;
+  environment.pathsToLink = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
 }
diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
index d6ebaa96a21b..f4eba9bba142 100644
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/desktop-managers/kde-environment.nix
@@ -1,7 +1,7 @@
 {pkgs, config, ...}:
 
 let
-  inherit (pkgs.lib) mkOption mkIf types;
+  inherit (pkgs.lib) mkDefaultValue mkOption mkIf types;
   kdePackages = config.environment.kdePackages;
 
   options = {
@@ -30,6 +30,6 @@ mkIf (kdePackages != [] && config.services.xserver.enable) {
   environment = {
     x11Packages = kdePackages;
     systemPackages = kdePackages;
-    extraLinkPaths = [ "/share" "/plugins" ];
+    pathsToLink = [ "/share" "/plugins" ];
   };
 }