summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-06-07 19:40:10 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-06-07 19:40:10 +0200
commitb1562bb4ab36711d369c597d2b8630e0328eb393 (patch)
tree7c95943975350ba6ec60bf29e2eab87ff3f32e50
parentda96566c406bb7f202812f97fb1a55655187dc8b (diff)
downloadnixos-b1562bb4ab36711d369c597d2b8630e0328eb393.tar
nixos-b1562bb4ab36711d369c597d2b8630e0328eb393.tar.gz
nixos-b1562bb4ab36711d369c597d2b8630e0328eb393.tar.bz2
nixos-b1562bb4ab36711d369c597d2b8630e0328eb393.tar.xz
nixos-b1562bb4ab36711d369c597d2b8630e0328eb393.zip
trivmix & promiscuous (irc said so)
-rw-r--r--bragi.nix5
-rw-r--r--customized/jack2.nix5
-rw-r--r--customized/mpd.nix5
-rw-r--r--customized/trivmix.nix24
4 files changed, 38 insertions, 1 deletions
diff --git a/bragi.nix b/bragi.nix
index b3eb6336..a0448bbb 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -25,6 +25,7 @@
25 25
26 nixpkgs.config.packageOverrides = pkgs: 26 nixpkgs.config.packageOverrides = pkgs:
27 { 27 {
28 trivmix = pkgs.callPackage ./customized/trivmix.nix {};
28 jack2 = pkgs.callPackage ./customized/jack2.nix {}; 29 jack2 = pkgs.callPackage ./customized/jack2.nix {};
29 mpd = pkgs.callPackage ./customized/mpd.nix { 30 mpd = pkgs.callPackage ./customized/mpd.nix {
30 gmeSupport = false; 31 gmeSupport = false;
@@ -63,7 +64,9 @@
63 ''; 64 '';
64 }; 65 };
65 66
66 environment.etc."jackdrc".text = "${pkgs.jack2}/bin/jackd -d alsa -M -H -r 96000"; 67 environment.etc."jackdrc".text = ''
68 ${pkgs.jack2}/bin/jackd -d alsa -M -H -r 96000
69 '';
67 70
68 services.mpd = { 71 services.mpd = {
69 enable = true; 72 enable = true;
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
7cabal.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})