From af23241b165c01cb45e75c252ebf2bf51188c0a0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Dec 2015 13:08:31 +0100
Subject: profiles/base: Use overrides for nixUnstable.

Setting nix.package uses nixUnstable for the deamon but not for packages
depending on Nix, so instead of setting nix.package, let's just override
the "nix" attribute directly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/profiles/base.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix
index 3a99fc42..ffa968ae 100644
--- a/modules/user/aszlig/profiles/base.nix
+++ b/modules/user/aszlig/profiles/base.nix
@@ -10,7 +10,6 @@ in {
 
   config = lib.mkIf cfg.enable {
     nix = {
-      package = pkgs.nixUnstable;
       useChroot = true;
       readOnlyStore = true;
       extraOptions = ''
@@ -73,7 +72,7 @@ in {
 
       allowBroken = true;
 
-      packageOverrides = pkgs: {
+      packageOverrides = pkgs: rec {
         nixUnstable = pkgs.lib.overrideDerivation pkgs.nixUnstable (drv: {
           patches = (drv.patches or []) ++ lib.singleton (pkgs.fetchpatch {
             url = "https://github.com/NixOS/nix/commit/"
@@ -87,6 +86,7 @@ in {
         netrw = pkgs.netrw.override {
           checksumType = "mhash";
         };
+        nix = nixUnstable;
         uqm = pkgs.uqm.override {
           use3DOVideos = true;
           useRemixPacks = true;
-- 
cgit 1.4.1