diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-07 19:40:10 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-06-07 19:40:10 +0200 |
| commit | b1562bb4ab36711d369c597d2b8630e0328eb393 (patch) | |
| tree | 7c95943975350ba6ec60bf29e2eab87ff3f32e50 /customized | |
| parent | da96566c406bb7f202812f97fb1a55655187dc8b (diff) | |
| download | nixos-b1562bb4ab36711d369c597d2b8630e0328eb393.tar nixos-b1562bb4ab36711d369c597d2b8630e0328eb393.tar.gz nixos-b1562bb4ab36711d369c597d2b8630e0328eb393.tar.bz2 nixos-b1562bb4ab36711d369c597d2b8630e0328eb393.tar.xz nixos-b1562bb4ab36711d369c597d2b8630e0328eb393.zip | |
trivmix & promiscuous (irc said so)
Diffstat (limited to 'customized')
| -rw-r--r-- | customized/jack2.nix | 5 | ||||
| -rw-r--r-- | customized/mpd.nix | 5 | ||||
| -rw-r--r-- | customized/trivmix.nix | 24 |
3 files changed, 34 insertions, 0 deletions
diff --git a/customized/jack2.nix b/customized/jack2.nix index e65bdb0d..1a7b0adc 100644 --- a/customized/jack2.nix +++ b/customized/jack2.nix | |||
| @@ -33,6 +33,11 @@ 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 \ | ||
| 38 | --set JACK_PROMISCUOUS_SERVER 1 \ | ||
| 39 | --run "umask 0" | ||
| 40 | done | ||
| 36 | ''; | 41 | ''; |
| 37 | 42 | ||
| 38 | meta = with stdenv.lib; { | 43 | meta = with stdenv.lib; { |
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 | ''; |
diff --git a/customized/trivmix.nix b/customized/trivmix.nix new file mode 100644 index 00000000..aefc09e5 --- /dev/null +++ b/customized/trivmix.nix | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | # This file was auto-generated by cabal2nix. Please do NOT edit manually! | ||
| 2 | |||
| 3 | { cabal, filepath, hinotify, jack, optparseApplicative | ||
| 4 | , transformers | ||
| 5 | }: | ||
| 6 | |||
| 7 | cabal.mkDerivation (self: { | ||
| 8 | pname = "trivmix"; | ||
| 9 | version = "0.0.0"; | ||
| 10 | src = fetchgit { | ||
| 11 | url = git://git.yggdrasil.li/trivmix; | ||
| 12 | rev = "bd7874ef606ae78bb8b626bd01906481feb784d6"; | ||
| 13 | sha256 = "284f2b38daf7685ad9d92f39872cdf78c870b1997a8d8ac027fd75d187a505ea"; | ||
| 14 | }; | ||
| 15 | isLibrary = false; | ||
| 16 | isExecutable = true; | ||
| 17 | buildDepends = [ | ||
| 18 | filepath hinotify jack optparseApplicative transformers | ||
| 19 | ]; | ||
| 20 | meta = { | ||
| 21 | license = self.stdenv.lib.licenses.publicDomain; | ||
| 22 | platforms = self.ghc.meta.platforms; | ||
| 23 | }; | ||
| 24 | }) | ||
