From 18d920f6cd3bb91caac1bb7f0a87c3f125ea57ae Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 31 Aug 2017 15:53:24 +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 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bragi.nix b/bragi.nix
index 538324ec..5a8458b5 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -26,24 +26,23 @@ in rec {
   networking.hostId = "2af11085";
   networking.wireless.enable = true;
 
-  nixpkgs.config.packageOverrides = pkgs:
+  nixpkgs.config.packageOverrides = oldPkgs:
     rec {
-      haskellPackages = pkgs.haskellPackages.override {
+      haskellPackages = oldPkgs.haskellPackages.override {
         overrides = self: super: {
-          filelock = pkgs.haskell.lib.dontCheck super.filelock;
           trivmix = self.callPackage ./custom/trivmix/trivmix.nix {};
           inherit
             (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super)
-            Glob;
+            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; };
+      jack2Full = oldPkgs.jack2Full.override { dbus = null; };
 
-      mpd = pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
+      mpd = oldPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
       
       inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint;
     };
-- 
cgit v1.2.3