From c9de1ea49e8c188e524951a4256247e801bb25e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 23 Oct 2014 14:08:33 +0200 Subject: [PATCH] xfce4-panel: synchronize gst plugins with xfce4-mixer --- pkgs/desktops/xfce/applications/xfce4-mixer.nix | 3 +++ 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 f486373ee17..d9be20150b8 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 2c64754e96a..7fa8862ea3b 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 = ''