summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-07-09 18:00:25 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-07-09 18:00:25 +0200
commit00f439d328c8e04b714afe20ef049e83391e4b37 (patch)
treee7e5912192193965d30b6377a8aede5561f5f7ad
parenta399efba452985c47ac8ecc689b592d784729c71 (diff)
downloadnixos-00f439d328c8e04b714afe20ef049e83391e4b37.tar
nixos-00f439d328c8e04b714afe20ef049e83391e4b37.tar.gz
nixos-00f439d328c8e04b714afe20ef049e83391e4b37.tar.bz2
nixos-00f439d328c8e04b714afe20ef049e83391e4b37.tar.xz
nixos-00f439d328c8e04b714afe20ef049e83391e4b37.zip
better wrapping of mpd
-rw-r--r--bragi.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/bragi.nix b/bragi.nix
index 04819302..fb26e14c 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -59,11 +59,17 @@ in rec {
59 ''; 59 '';
60 }; 60 };
61 61
62 mpd = pkgs.callPackage ./customized/mpd.nix { 62 mpd = pkgs.symlinkJoin {
63 gmeSupport = false; 63 name = "mpd";
64 game-music-emu = null; 64 paths = [ (pkgs.mpd.override { gmeSupport = false; game-music-emu = null; pulseaudio = pkgs.pulseaudioLight; }) ];
65 pulseaudio = pkgs.pulseaudioLight; 65 buildInputs = [ pkgs.makeWrapper ];
66 postBuild = ''
67 wrapProgram $out/bin/mpd \
68 --set JACK_PROMISCUOUS_SERVER 1 \
69 --run "umask 0"
70 '';
66 }; 71 };
72
67 mpv = pkgs.stdenv.lib.overrideDerivation pkgs.mpv (oldAttrs: { 73 mpv = pkgs.stdenv.lib.overrideDerivation pkgs.mpv (oldAttrs: {
68 buildInputs = oldAttrs.buildInputs ++ [pkgs.makeWrapper]; 74 buildInputs = oldAttrs.buildInputs ++ [pkgs.makeWrapper];
69 postInstall = '' 75 postInstall = ''