about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-08-08 10:24:59 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-08-08 10:24:59 +0200
commitfc35a3d649d5426336a01cc1a3a9ee0b186c3f7a (patch)
treee9770bc6a392cb1f51b20f95871b56e366fd9d28 /modules
parentb0a2a69ca4718e7e4eb4ff0679eb1d1c0ee2ea97 (diff)
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>
Diffstat (limited to 'modules')
-rw-r--r--modules/user/aszlig/profiles/base.nix11
1 files changed, 6 insertions, 5 deletions
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 ];