summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bragi.nix24
1 files changed, 11 insertions, 13 deletions
diff --git a/bragi.nix b/bragi.nix
index c7d34b7f..086c391e 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -28,19 +28,17 @@ in rec {
28 28
29 nixpkgs.config.packageOverrides = pkgs: 29 nixpkgs.config.packageOverrides = pkgs:
30 rec { 30 rec {
31 haskellPackages = pkgs.recurseIntoAttrs ( 31 haskellPackages = pkgs.haskellPackages.override {
32 pkgs.haskellPackages.override { 32 overrides = self: super: {
33 overrides = self: super: { 33 trivmix = self.callPackage ./custom/trivmix/trivmix.nix {};
34 trivmix = self.callPackage ./custom/trivmix/trivmix.nix { filelock = pkgs.haskell.lib.dontCheck super.filelock; }; 34 inherit
35 inherit 35 (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super)
36 (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super) 36 Glob filelock;
37 Glob filelock; 37 inherit
38 inherit 38 ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); })
39 ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); }) 39 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
40 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; 40 };
41 }; 41 };
42 }
43 );
44 42
45 jack2Full = pkgs.jack2Full.override { dbus = null; }; 43 jack2Full = pkgs.jack2Full.override { dbus = null; };
46 44