diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-07 17:33:27 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-07 17:33:27 +0200 |
commit | e1dc40b375847ce8ab352f95410258a4808825f0 (patch) | |
tree | 9dbb6dd320d9f5f5c1240f0891b086f264d13b93 | |
parent | 460de988a7a96c66a9195a89f7338551be63c35c (diff) | |
download | nixos-e1dc40b375847ce8ab352f95410258a4808825f0.tar nixos-e1dc40b375847ce8ab352f95410258a4808825f0.tar.gz nixos-e1dc40b375847ce8ab352f95410258a4808825f0.tar.bz2 nixos-e1dc40b375847ce8ab352f95410258a4808825f0.tar.xz nixos-e1dc40b375847ce8ab352f95410258a4808825f0.zip |
Hopefull try
-rw-r--r-- | bragi.nix | 6 | ||||
-rw-r--r-- | customized/jack2.nix | 2 | ||||
-rw-r--r-- | customized/mpd.nix | 5 |
3 files changed, 11 insertions, 2 deletions
@@ -68,6 +68,8 @@ | |||
68 | serviceConfig = { | 68 | serviceConfig = { |
69 | Type = "simple"; | 69 | Type = "simple"; |
70 | ExecStart = "${pkgs.jack2}/bin/jackd -d alsa -M -H -r 96000"; | 70 | ExecStart = "${pkgs.jack2}/bin/jackd -d alsa -M -H -r 96000"; |
71 | User = "mpd"; | ||
72 | Group = "audio"; | ||
71 | }; | 73 | }; |
72 | }; | 74 | }; |
73 | 75 | ||
@@ -82,8 +84,8 @@ | |||
82 | } | 84 | } |
83 | ''; | 85 | ''; |
84 | }; | 86 | }; |
85 | 87 | ||
86 | users.extraUsers.guest = { | 88 | users.extraUsers.gkleen = { |
87 | name = "gkleen"; | 89 | name = "gkleen"; |
88 | isNormalUser = true; | 90 | isNormalUser = true; |
89 | uid = 1000; | 91 | uid = 1000; |
diff --git a/customized/jack2.nix b/customized/jack2.nix index 1432eea9..4788fb0a 100644 --- a/customized/jack2.nix +++ b/customized/jack2.nix | |||
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec { | |||
33 | installPhase = '' | 33 | installPhase = '' |
34 | python waf install | 34 | python waf install |
35 | wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH | 35 | wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH |
36 | for bin in $out/bin/*; do | ||
37 | wrapProgram $bin --set JACK_PROMISCUOUS_SERVER 1 | ||
36 | done | 38 | done |
37 | ''; | 39 | ''; |
38 | 40 | ||
diff --git a/customized/mpd.nix b/customized/mpd.nix index 0b7b1edf..f579a4bf 100644 --- a/customized/mpd.nix +++ b/customized/mpd.nix | |||
@@ -100,6 +100,11 @@ in stdenv.mkDerivation rec { | |||
100 | ++ opt stdenv.isLinux | 100 | ++ opt stdenv.isLinux |
101 | "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; | 101 | "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; |
102 | 102 | ||
103 | postInstall = '' | ||
104 | wrapProgram $out/bin/mpd \ | ||
105 | --set JACK_PROMISCUOUS_SERVER 1 | ||
106 | ''; | ||
107 | |||
103 | NIX_LDFLAGS = '' | 108 | NIX_LDFLAGS = '' |
104 | ${if shoutSupport then "-lshout" else ""} | 109 | ${if shoutSupport then "-lshout" else ""} |
105 | ''; | 110 | ''; |