summaryrefslogtreecommitdiff
path: root/bragi.nix
diff options
context:
space:
mode:
Diffstat (limited to 'bragi.nix')
-rw-r--r--bragi.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/bragi.nix b/bragi.nix
index f0817580..bb31a2c5 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -33,6 +33,7 @@ in rec {
33 callPackage = pkgs.lib.callPackageWith ( pkgs // self ); 33 callPackage = pkgs.lib.callPackageWith ( pkgs // self );
34 in { 34 in {
35 trivmix = callPackage ./custom/trivmix {}; 35 trivmix = callPackage ./custom/trivmix {};
36 inherit (pkgs.callPackage ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
36 }; 37 };
37 } 38 }
38 ); 39 );
@@ -41,9 +42,7 @@ in rec {
41 42
42 mpd = pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }; 43 mpd = pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
43 44
44 inherit (pkgs.callPackage ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-server thermoprint-webgui tprint; 45 inherit (haskellPackages) trivmix thermoprint-server thermoprint-webgui tprint;
45
46 inherit (haskellPackages) trivmix;
47 }; 46 };
48 47
49 nixpkgs.config.allowUnfree = true; 48 nixpkgs.config.allowUnfree = true;