diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2014-10-23 03:12:45 +0400 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2014-10-23 16:22:43 +0400 |
| commit | d771822d5f7d2f5e8d5d1485ee1646b3a0fd733e (patch) | |
| tree | a176270bfd1517976b9a7c0e1b2ef2a113bf7c2f /pkgs/desktops | |
| parent | 333ccae68fae07d71b52fafe5a4d2e8033e8fff5 (diff) | |
| download | nixlib-d771822d5f7d2f5e8d5d1485ee1646b3a0fd733e.tar nixlib-d771822d5f7d2f5e8d5d1485ee1646b3a0fd733e.tar.gz nixlib-d771822d5f7d2f5e8d5d1485ee1646b3a0fd733e.tar.bz2 nixlib-d771822d5f7d2f5e8d5d1485ee1646b3a0fd733e.tar.lz nixlib-d771822d5f7d2f5e8d5d1485ee1646b3a0fd733e.tar.xz nixlib-d771822d5f7d2f5e8d5d1485ee1646b3a0fd733e.tar.zst nixlib-d771822d5f7d2f5e8d5d1485ee1646b3a0fd733e.zip | |
xfce4-mixer: add pulseaudio support
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/xfce/applications/xfce4-mixer.nix | 10 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/default.nix | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index d9be20150b86..78c37771811b 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 d46c21d4e558..2d4ef5583480 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -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 { }; |