diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 22:44:52 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 22:44:52 +0000 |
commit | fe1115caf48a467349127723a0e60b106433a076 (patch) | |
tree | faf0e4045681f9afc916c5962cf8c52deb479f78 /pkgs/desktops | |
parent | 03875e0bce8ac31d54c6167eeba8cad11a8c22e0 (diff) | |
download | nixlib-fe1115caf48a467349127723a0e60b106433a076.tar nixlib-fe1115caf48a467349127723a0e60b106433a076.tar.gz nixlib-fe1115caf48a467349127723a0e60b106433a076.tar.bz2 nixlib-fe1115caf48a467349127723a0e60b106433a076.tar.lz nixlib-fe1115caf48a467349127723a0e60b106433a076.tar.xz nixlib-fe1115caf48a467349127723a0e60b106433a076.tar.zst nixlib-fe1115caf48a467349127723a0e60b106433a076.zip |
Make nixpkgs ready for gst_all attrset removal
svn path=/nixpkgs/trunk/; revision=33092
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix | 10 | ||||
-rw-r--r-- | pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix index db28274be072..76cc5ea028f0 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 = { diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix index bb50a0610f60..2f1ab8a8e93c 100644 --- a/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce-4.8/applications/xfce4-mixer.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gst_all, gtk -, libxfce4util, libxfce4ui, xfce4panel, xfconf }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base +, gtk, libxfce4util, libxfce4ui, xfce4panel, xfconf }: 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 libxfce4ui xfce4panel xfconf ]; 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 = { |