summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-08-02 14:31:24 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-08-02 14:31:24 +0200
commit14e7a5ee5a284d4bca2acfdba714eba200629169 (patch)
treee2d5ca27800ec8aa00bef6d2ccc37bb2dbb2f11a
parent97ceb73d38fbabf7f5c610717ff74f5f45dbb757 (diff)
downloadnixos-14e7a5ee5a284d4bca2acfdba714eba200629169.tar
nixos-14e7a5ee5a284d4bca2acfdba714eba200629169.tar.gz
nixos-14e7a5ee5a284d4bca2acfdba714eba200629169.tar.bz2
nixos-14e7a5ee5a284d4bca2acfdba714eba200629169.tar.xz
nixos-14e7a5ee5a284d4bca2acfdba714eba200629169.zip
trivmix as top-level pkg
-rw-r--r--bragi.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/bragi.nix b/bragi.nix
index 56aab6e5..cb798ab6 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -52,6 +52,8 @@ in rec {
52 mpd = pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }; 52 mpd = pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
53 53
54 inherit (pkgs.callPackage ./custom/thermoprint {}) thermoprint-server thermoprint-webgui tprint; 54 inherit (pkgs.callPackage ./custom/thermoprint {}) thermoprint-server thermoprint-webgui tprint;
55
56 inherit pkgs.haskellPackages.trivmix;
55 }; 57 };
56 58
57 environment.systemPackages = with pkgs; [ 59 environment.systemPackages = with pkgs; [
@@ -61,7 +63,7 @@ in rec {
61 tmux 63 tmux
62 nfs-utils 64 nfs-utils
63 jack2Full 65 jack2Full
64 haskellPackages.trivmix 66 trivmix
65 zsh 67 zsh
66 tprint 68 tprint
67 ]; 69 ];