public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfce4-mixer: add pulseaudio support

This commit is contained in:
Nikolay Amiantov 2014-10-23 03:12:45 +04:00
parent 333ccae68f
commit d771822d5f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/xfce/applications/xfce4-mixer.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper { stdenv, fetchurl, pkgconfig, intltool, makeWrapper
, glib, gstreamer, gst_plugins_base, gtk , glib, gstreamer, gst_plugins_base, gtk
, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null , libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null
, pulseaudioSupport ? false, gst_plugins_good
}: }:
let let
@ -9,7 +10,10 @@ let
gst_plugins_minimal = gst_plugins_base.override { gst_plugins_minimal = gst_plugins_base.override {
minimalDeps = true; 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 in
@ -25,9 +29,9 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}"; name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = buildInputs =
[ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk [ pkgconfig intltool glib gstreamer gtk
libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper
]; ] ++ gst_plugins;
postInstall = postInstall =
'' ''

4
pkgs/desktops/xfce/default.nix
View File

@ -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 { }; parole = callPackage ./applications/parole.nix { };
ristretto = callPackage ./applications/ristretto.nix { }; ristretto = callPackage ./applications/ristretto.nix { };
terminal = xfce4terminal; # it has changed its name 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 { }; xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { };
xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
xfce4terminal = callPackage ./applications/terminal.nix { }; xfce4terminal = callPackage ./applications/terminal.nix { };