Merge pull request #4627 from abbradar/xfce-mixer

xfce4-mixer: add pulseaudio support

2 files changed, 11 insertions, 5 deletions

diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
index d9be20150b866..78c37771811bc 100644
--- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, makeWrapper
 , glib, gstreamer, gst_plugins_base, gtk
 , libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null
+, pulseaudioSupport ? false, gst_plugins_good
 }:
 
 let
@@ -9,7 +10,10 @@ let
   gst_plugins_minimal = gst_plugins_base.override {
     minimalDeps = true;
   };
-  gst_plugins = [ gst_plugins_minimal ];
+  gst_plugins_pulse = gst_plugins_good.override {
+    minimalDeps = true;
+  };
+  gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse;
 
 in
 
@@ -25,9 +29,9 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs =
-    [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
+    [ pkgconfig intltool glib gstreamer gtk
       libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper
-    ];
+    ] ++ gst_plugins;
 
   postInstall =
     ''
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index ae6b1a88a14d9..2d4ef55834801 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, newScope }: let
+{ config, pkgs, newScope }: let
 
 callPackage = newScope (deps // xfce_self);
 
@@ -44,7 +44,9 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   parole          = callPackage ./applications/parole.nix { };
   ristretto       = callPackage ./applications/ristretto.nix { };
   terminal        = xfce4terminal; # it has changed its name
-  xfce4mixer      = callPackage ./applications/xfce4-mixer.nix { };
+  xfce4mixer      = callPackage ./applications/xfce4-mixer.nix {
+    pulseaudioSupport = config.pulseaudio or false;
+  };
   xfce4notifyd    = callPackage ./applications/xfce4-notifyd.nix { };
   xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
   xfce4terminal   = callPackage ./applications/terminal.nix { };