diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-10-23 14:08:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-10-23 14:08:33 +0200 |
| commit | c9de1ea49e8c188e524951a4256247e801bb25e2 (patch) | |
| tree | e2dbe8b2a0f473b93252c76c3dafefc25303fd09 /pkgs | |
| parent | 72ad2486068c293b4597022347dceb66935aca73 (diff) | |
| download | nixlib-c9de1ea49e8c188e524951a4256247e801bb25e2.tar nixlib-c9de1ea49e8c188e524951a4256247e801bb25e2.tar.gz nixlib-c9de1ea49e8c188e524951a4256247e801bb25e2.tar.bz2 nixlib-c9de1ea49e8c188e524951a4256247e801bb25e2.tar.lz nixlib-c9de1ea49e8c188e524951a4256247e801bb25e2.tar.xz nixlib-c9de1ea49e8c188e524951a4256247e801bb25e2.tar.zst nixlib-c9de1ea49e8c188e524951a4256247e801bb25e2.zip | |
xfce4-panel: synchronize gst plugins with xfce4-mixer
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/xfce/applications/xfce4-mixer.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/core/xfce4-panel.nix | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index f486373ee17d..d9be20150b86 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -9,6 +9,7 @@ let gst_plugins_minimal = gst_plugins_base.override { minimalDeps = true; }; + gst_plugins = [ gst_plugins_minimal ]; in @@ -34,6 +35,8 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; + passthru = { inherit gst_plugins; }; + meta = { homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive description = "A volume control application for the Xfce desktop environment"; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 2c64754e96a1..7fa8862ea3be 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libwnck, exo, garcon, xfconf, libstartup_notification -, makeWrapper, gst_plugins_base }: +, makeWrapper, xfce4mixer }: stdenv.mkDerivation rec { p_name = "xfce4-panel"; @@ -18,9 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck - garcon xfconf libstartup_notification - makeWrapper gst_plugins_base - ]; + garcon xfconf libstartup_notification makeWrapper + ] ++ xfce4mixer.gst_plugins; propagatedBuildInputs = [ libxfce4ui ]; postInstall = '' |