summaryrefslogtreecommitdiff
path: root/custom
diff options
context:
space:
mode:
Diffstat (limited to 'custom')
-rw-r--r--custom/bar-service.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/custom/bar-service.nix b/custom/bar-service.nix
index cf4f7a8c..5ec3a9d0 100644
--- a/custom/bar-service.nix
+++ b/custom/bar-service.nix
@@ -96,7 +96,7 @@ in {
96 96
97 nixpkgs.config.allowUnfree = true; 97 nixpkgs.config.allowUnfree = true;
98 98
99 packages.thermoprint.enable = true; 99 packages.thermoprint.enable = cfg.thermoprintBaseURL != null;
100 100
101 users.users."${cfg.user}" = { 101 users.users."${cfg.user}" = {
102 group = cfg.group; 102 group = cfg.group;
@@ -112,7 +112,13 @@ in {
112 haskell = superPkgs.haskell // { 112 haskell = superPkgs.haskell // {
113 packages = superPkgs.haskell.packages // { 113 packages = superPkgs.haskell.packages // {
114 ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: { 114 ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: {
115 bar = superPkgs.callPackage ./bar { haskellPackages = selfH; }; 115 bar = superPkgs.callPackage ./bar {
116 haskellPackages = selfH // {
117 thermoprint-client = if (cfg.thermoprintBaseURL != null)
118 then selfH.thermoprint-client
119 else null;
120 };
121 };
116 }); 122 });
117 }; 123 };
118 }; 124 };