From f48fba790d3c60b457d8a5760e77e52bf88d95ae Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 31 Aug 2017 15:44:57 +0200
Subject: =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bragi.nix | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'bragi.nix')

diff --git a/bragi.nix b/bragi.nix
index c7d34b7f..086c391e 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -28,19 +28,17 @@ in rec {
 
   nixpkgs.config.packageOverrides = pkgs:
     rec {
-      haskellPackages = pkgs.recurseIntoAttrs (
-        pkgs.haskellPackages.override {
-          overrides = self: super: {
-            trivmix = self.callPackage ./custom/trivmix/trivmix.nix { filelock = pkgs.haskell.lib.dontCheck super.filelock; };
-            inherit
-              (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super)
-              Glob filelock;
-            inherit
-              ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); })
-              thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
-          };
-        }
-      );
+      haskellPackages = pkgs.haskellPackages.override {
+        overrides = self: super: {
+          trivmix = self.callPackage ./custom/trivmix/trivmix.nix {};
+          inherit
+            (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super)
+            Glob filelock;
+          inherit
+            ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); })
+            thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
+        };
+      };
 
       jack2Full = pkgs.jack2Full.override { dbus = null; };
 
-- 
cgit v1.2.3