summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bragi.nix11
1 files 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 {
26 networking.hostId = "2af11085"; 26 networking.hostId = "2af11085";
27 networking.wireless.enable = true; 27 networking.wireless.enable = true;
28 28
29 nixpkgs.config.packageOverrides = pkgs: 29 nixpkgs.config.packageOverrides = oldPkgs:
30 rec { 30 rec {
31 haskellPackages = pkgs.haskellPackages.override { 31 haskellPackages = oldPkgs.haskellPackages.override {
32 overrides = self: super: { 32 overrides = self: super: {
33 filelock = pkgs.haskell.lib.dontCheck super.filelock;
34 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {}; 33 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {};
35 inherit 34 inherit
36 (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super) 35 (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super)
37 Glob; 36 Glob filelock;
38 inherit 37 inherit
39 ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); }) 38 ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); })
40 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; 39 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
41 }; 40 };
42 }; 41 };
43 42
44 jack2Full = pkgs.jack2Full.override { dbus = null; }; 43 jack2Full = oldPkgs.jack2Full.override { dbus = null; };
45 44
46 mpd = pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }; 45 mpd = oldPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
47 46
48 inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint; 47 inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint;
49 }; 48 };