From 82d6aa0c97220b1398cd46824fa61c7c2a09dd18 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 31 Oct 2017 12:26:39 +0100
Subject: [PATCH] xdg: fix use of base path

---
 modules/misc/xdg.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix
index 941d51ed8..8dcf1fba4 100644
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@@ -6,14 +6,14 @@ let
 
   cfg = config.xdg;
 
-  fileType = basePath: (types.loaOf (types.submodule (
+  fileType = basePathDesc: basePath: (types.loaOf (types.submodule (
     { name, config, ... }: {
       options = {
         target = mkOption {
           type = types.str;
-          apply = p: "${cfg.configHome}/${p}";
+          apply = p: "${basePath}/${p}";
           description = ''
-            Path to target file relative to <varname>${basePath}</varname>.
+            Path to target file relative to <varname>${basePathDesc}</varname>.
           '';
         };
 
@@ -81,7 +81,7 @@ in
     };
 
     configFile = mkOption {
-      type = fileType "xdg.configHome";
+      type = fileType "xdg.configHome" cfg.configHome;
       default = {};
       description = ''
         Attribute set of files to link into the user's XDG