summary refs log tree commit diff
path: root/pkgs/desktops/xfce-4.6
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-14 22:44:52 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-14 22:44:52 +0000
commitfe1115caf48a467349127723a0e60b106433a076 (patch)
treefaf0e4045681f9afc916c5962cf8c52deb479f78 /pkgs/desktops/xfce-4.6
parent03875e0bce8ac31d54c6167eeba8cad11a8c22e0 (diff)
Make nixpkgs ready for gst_all attrset removal
svn path=/nixpkgs/trunk/; revision=33092
Diffstat (limited to 'pkgs/desktops/xfce-4.6')
-rw-r--r--pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix
index db28274be0722..76cc5ea028f07 100644
--- a/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk
-, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base
+, gtk, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }:
 
 let
 
   # The usual Gstreamer plugins package has a zillion dependencies
   # that we don't need for a simple mixer, so build a minimal package.
-  gstPluginsBase = gst_all.gstPluginsBase.override {
+  gst_plugins_minimal = gst_plugins_base.override {
     minimalDeps = true;
   };
 
@@ -20,14 +20,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig intltool glib gst_all.gstreamer gstPluginsBase gtk
+    [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
       libxfce4util libxfcegui4 xfce4panel xfconf makeWrapper
     ];
 
   postInstall =
     ''
       mkdir -p $out/nix-support
-      echo ${gstPluginsBase} > $out/nix-support/propagated-user-env-packages
+      echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages
     '';
 
   meta = {