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

Merge pull request #4627 from abbradar/xfce-mixer

Browse Source 
xfce4-mixer: add pulseaudio support
This commit is contained in:
cillianderoiste 2014-10-31 15:08:42 +01:00
commit 919ed14477
4 changed files with 19 additions and 10 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 =
'' ''

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

@ -1,4 +1,4 @@
{ pkgs, newScope }: let { config, pkgs, newScope }: let
callPackage = newScope (deps // xfce_self); 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 { }; 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 { };

11
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
View File

@ -2,6 +2,9 @@
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc , libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
, glib, gstreamer, bzip2 , glib, gstreamer, bzip2
, # Whether to build no plugins that have external dependencies
# (except the PulseAudio plugin).
minimalDeps ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,10 +23,10 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-oss"; configureFlags = "--disable-oss";
buildInputs = buildInputs =
[ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883 [ pkgconfig glib gstreamer gst_plugins_base pulseaudio ]
aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex ++ stdenv.lib.optionals (!minimalDeps)
taglib bzip2 libvpx gdk_pixbuf orc [ aalib libcaca cairo libdv flac libjpeg libpng speex
]; taglib bzip2 libvpx gdk_pixbuf orc ];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View File

@ -11705,7 +11705,7 @@ let
mate-themes = callPackage ../misc/themes/mate-themes { }; mate-themes = callPackage ../misc/themes/mate-themes { };
xfce = xfce4_10; xfce = xfce4_10;
xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });
### SCIENCE ### SCIENCE