summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-06-07 18:00:00 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-06-07 18:00:00 +0200
commitd24d56886f418121a2115ed367e417c3cca35feb (patch)
tree54d4a4347b778e0efe4dd4b17fa12224ff568d93
parente1dc40b375847ce8ab352f95410258a4808825f0 (diff)
downloadnixos-d24d56886f418121a2115ed367e417c3cca35feb.tar
nixos-d24d56886f418121a2115ed367e417c3cca35feb.tar.gz
nixos-d24d56886f418121a2115ed367e417c3cca35feb.tar.bz2
nixos-d24d56886f418121a2115ed367e417c3cca35feb.tar.xz
nixos-d24d56886f418121a2115ed367e417c3cca35feb.zip
nope, no PROMISCUOUS
-rw-r--r--customized/jack2.nix2
-rw-r--r--customized/mpd.nix5
2 files changed, 0 insertions, 7 deletions
diff --git a/customized/jack2.nix b/customized/jack2.nix
index 4788fb0a..1432eea9 100644
--- a/customized/jack2.nix
+++ b/customized/jack2.nix
@@ -33,8 +33,6 @@ 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
38 done 36 done
39 ''; 37 '';
40 38
diff --git a/customized/mpd.nix b/customized/mpd.nix
index f579a4bf..0b7b1edf 100644
--- a/customized/mpd.nix
+++ b/customized/mpd.nix
@@ -100,11 +100,6 @@ 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
108 NIX_LDFLAGS = '' 103 NIX_LDFLAGS = ''
109 ${if shoutSupport then "-lshout" else ""} 104 ${if shoutSupport then "-lshout" else ""}
110 ''; 105 '';