From fc35a3d649d5426336a01cc1a3a9ee0b186c3f7a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 8 Aug 2015 10:24:59 +0200
Subject: profiles/base: Properly disable hinotify tests.

Using nixpkgs.config.haskellPackageOverrides isn't going to work for
NixOS configurations, because the other packageOverrides will override
the haskellPackageOverrides with a new instantiation of <nixpkgs>.

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

(limited to 'modules/user')

diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix
index e4dc641d..55068eb9 100644
--- a/modules/user/aszlig/profiles/base.nix
+++ b/modules/user/aszlig/profiles/base.nix
@@ -83,13 +83,14 @@ in {
         w3m = pkgs.w3m.override {
           graphicsSupport = true;
         };
-      };
 
-      haskellPackageOverrides = lib.const (super: {
-        hinotify = super.hinotify.overrideDerivation (lib.const {
-          doCheck = false;
+        # XXX: Workaround for fixing hinotify build.
+        haskellPackages = pkgs.recurseIntoAttrs (pkgs.haskellPackages.override {
+          hinotify = lib.const (super: super.hinotify.overrideDerivation {
+            doCheck = false;
+          });
         });
-      });
+      };
     };
 
     system.fsPackages = with pkgs; [ sshfsFuse ];
-- 
cgit 1.4.1