summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bragi.nix5
m---------custom/thermoprint0
2 files changed, 1 insertions, 4 deletions
diff --git a/bragi.nix b/bragi.nix
index cbc04bf0..f2b464d1 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -94,11 +94,8 @@ in rec {
94 inherit 94 inherit
95 (lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH) 95 (lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH)
96 Glob filelock hedgehog; 96 Glob filelock hedgehog;
97 inherit
98 (selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); })
99 thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
100 bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; }; 97 bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; };
101 }); 98 } // (import ./custom/thermoprint { callPackage = superPkgs.lib.callPackageWith (selfH // { import (superH) makeWrapper runCommand; }); extraPackages = (p: with p; [ persistent-postgresql ]); }));
102 99
103 jack2Full = superPkgs.jack2Full.override { dbus = null; }; 100 jack2Full = superPkgs.jack2Full.override { dbus = null; };
104 101
diff --git a/custom/thermoprint b/custom/thermoprint
Subproject e8e0cb7f36641ffb7901178bc54fef98eba9215 Subproject 3bb6805738d09250bcbd7c9da0eb06b68072f4e