From 0c1a178890baa67d5407663b05823d3092ff660a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 8 Sep 2018 14:44:52 +0200
Subject: bar depends on thermoprint

---
 custom/bar-service.nix         | 10 ++++++++--
 custom/thermoprint-service.nix | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 custom/thermoprint-service.nix

diff --git a/custom/bar-service.nix b/custom/bar-service.nix
index 2a492ce1..aa08f7cd 100644
--- a/custom/bar-service.nix
+++ b/custom/bar-service.nix
@@ -53,6 +53,8 @@ in {
   };
 
   config = mkIf cfg.enable {
+    imports = [ ./thermoprint-service.nix ];
+
     assertions = [
       { assertion = config.services.postgresql.enable;
         message = "bar requires PostgreSQL";
@@ -69,8 +71,12 @@ in {
 
     users.groups."${cfg.group}" = {};
 
-    nixpkgs.overlays = [(self: super: {
-      bar = self.callPackage ./bar { inherit (self) haskellPackages; };
+    nixpkgs.overlays = [(selfPkgs: superPkgs: {
+      haskellPackages = superPkgs.haskellPackages.extend (selfH: superH: {
+        bar = superPkgs.callPackage ./bar { haskellPackages = selfH };
+      });
+
+      inherit (selfPkgs.haskellPackages) bar;
     })];
 
     systemd.services."bar" = {
diff --git a/custom/thermoprint-service.nix b/custom/thermoprint-service.nix
new file mode 100644
index 00000000..8773706c
--- /dev/null
+++ b/custom/thermoprint-service.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    nixpkgs.overlays = [(selfPkgs: superPkgs: {
+      haskellPackages = superPkgs.haskellPackages.extend (selfH: superH:
+        import ./custom/thermoprint {
+          callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; });
+          extraPackages = (p: []);
+        }
+      );
+
+      inherit (selfPkgs.haskellPackages) thermoprint-server thermoprint-webgui tprint;
+    };
+  };
+}
-- 
cgit v1.2.3