summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-03-09 16:45:13 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-03-09 16:45:13 +0100
commit7ef554f858013163087a05ee3811ddadbc2a0109 (patch)
tree66833d3787b7dba4510786c37360f8dab93338a9
parent370dd4bd9a5ee6526590a09f75a36769bf4a6907 (diff)
downloadnixos-7ef554f858013163087a05ee3811ddadbc2a0109.tar
nixos-7ef554f858013163087a05ee3811ddadbc2a0109.tar.gz
nixos-7ef554f858013163087a05ee3811ddadbc2a0109.tar.bz2
nixos-7ef554f858013163087a05ee3811ddadbc2a0109.tar.xz
nixos-7ef554f858013163087a05ee3811ddadbc2a0109.zip
Clean up mpd wrapping
-rw-r--r--bragi.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/bragi.nix b/bragi.nix
index 9214c894..62939d22 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -39,15 +39,7 @@ in rec {
39 39
40 jack2Full = pkgs.jack2Full.override { dbus = null; }; 40 jack2Full = pkgs.jack2Full.override { dbus = null; };
41 41
42 mpd = pkgs.symlinkJoin { 42 mpd = pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
43 name = "mpd";
44 paths = [ (pkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; }) ];
45 buildInputs = [ pkgs.makeWrapper ];
46 postBuild = ''
47 wrapProgram $out/bin/mpd \
48 --run "umask 0"
49 '';
50 };
51 43
52 inherit (pkgs.callPackage ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-server thermoprint-webgui tprint; 44 inherit (pkgs.callPackage ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); }) thermoprint-server thermoprint-webgui tprint;
53 45
@@ -164,6 +156,7 @@ in rec {
164 LimitMEMLOCK = "infinity"; 156 LimitMEMLOCK = "infinity";
165 Nice = "-5"; 157 Nice = "-5";
166 LimitRTPRIO = "95:95"; 158 LimitRTPRIO = "95:95";
159 UMask = "0000";
167 }; 160 };
168 161
169 users.extraUsers.jack = { 162 users.extraUsers.jack = {