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 @@
 
   nixpkgs.config.packageOverrides = pkgs:
     {
+      trivmix = pkgs.callPackage ./customized/trivmix.nix {};
       jack2 = pkgs.callPackage ./customized/jack2.nix {};
       mpd = pkgs.callPackage ./customized/mpd.nix {
         gmeSupport = false;
@@ -63,7 +64,9 @@
       '';
   };
 
-  environment.etc."jackdrc".text = "${pkgs.jack2}/bin/jackd -d alsa -M -H -r 96000";
+  environment.etc."jackdrc".text = ''
+    ${pkgs.jack2}/bin/jackd -d alsa -M -H -r 96000
+  '';
 
   services.mpd = {
     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 {
   installPhase = ''
     python waf install
     wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
+    for bin in $out/bin/*; do
+      wrapProgram $bin \
+        --set JACK_PROMISCUOUS_SERVER 1 \
+        --run "umask 0"
+    done
   '';
 
   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 {
     ++ opt stdenv.isLinux
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system";
 
+  postInstall = ''
+    wrapProgram $out/bin/mpd \
+      --set JACK_PROMISCUOUS_SERVER 1
+  '';
+
   NIX_LDFLAGS = ''
     ${if shoutSupport then "-lshout" else ""}
   '';
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 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, hinotify, jack, optparseApplicative
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "trivmix";
+  version = "0.0.0";
+  src = fetchgit {
+    url = git://git.yggdrasil.li/trivmix;
+    rev = "bd7874ef606ae78bb8b626bd01906481feb784d6";
+    sha256 = "284f2b38daf7685ad9d92f39872cdf78c870b1997a8d8ac027fd75d187a505ea";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    filepath hinotify jack optparseApplicative transformers
+  ];
+  meta = {
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})