diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-21 23:39:19 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-21 23:39:19 +0200 |
| commit | c7594c1c426a42832c0894903ff5689a4f6a2b30 (patch) | |
| tree | 39f49bfd7dd42893151b99b9a8b6511925da266f | |
| parent | 89f3e527558bdf00edf9c4d77e51398e869dac45 (diff) | |
| download | nixos-c7594c1c426a42832c0894903ff5689a4f6a2b30.tar nixos-c7594c1c426a42832c0894903ff5689a4f6a2b30.tar.gz nixos-c7594c1c426a42832c0894903ff5689a4f6a2b30.tar.bz2 nixos-c7594c1c426a42832c0894903ff5689a4f6a2b30.tar.xz nixos-c7594c1c426a42832c0894903ff5689a4f6a2b30.zip | |
…
| -rw-r--r-- | bragi.nix | 5 | ||||
| m--------- | custom/thermoprint | 0 |
2 files changed, 1 insertions, 4 deletions
| @@ -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 | ||
