about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-08-18 20:24:09 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-08-21 21:51:00 -0400
commitde89ad124d0ccf8c1dfaa5edeac84be03173ce48 (patch)
tree08f2e1b9f7c3dd8a793fbfbb1ec61a4deb803b95 /pkgs/desktops
parentae1cb0bdf98a325062eb9c5bd6af350ca9cf6bf2 (diff)
downloadnixlib-de89ad124d0ccf8c1dfaa5edeac84be03173ce48.tar
nixlib-de89ad124d0ccf8c1dfaa5edeac84be03173ce48.tar.gz
nixlib-de89ad124d0ccf8c1dfaa5edeac84be03173ce48.tar.bz2
nixlib-de89ad124d0ccf8c1dfaa5edeac84be03173ce48.tar.lz
nixlib-de89ad124d0ccf8c1dfaa5edeac84be03173ce48.tar.xz
nixlib-de89ad124d0ccf8c1dfaa5edeac84be03173ce48.tar.zst
nixlib-de89ad124d0ccf8c1dfaa5edeac84be03173ce48.zip
xfce4-14.xfce4-mixer: drop
obsoleted by xfce4-pulseaudio-plugin / dead package
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/xfce4-14/default.nix8
-rw-r--r--pkgs/desktops/xfce4-14/xfce4-mixer/default.nix32
2 files changed, 6 insertions, 34 deletions
diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix
index d3e46cf23654..e72aa97d9db8 100644
--- a/pkgs/desktops/xfce4-14/default.nix
+++ b/pkgs/desktops/xfce4-14/default.nix
@@ -58,8 +58,6 @@ makeScope newScope (self: with self; {
 
   xfce4-dict = callPackage ./xfce4-dict { };
 
-  xfce4-mixer = callPackage ./xfce4-mixer { };
-
   xfce4-netload-plugin = callPackage ./xfce4-netload-plugin { };
 
   xfce4-notifyd = callPackage ./xfce4-notifyd { };
@@ -110,4 +108,10 @@ makeScope newScope (self: with self; {
   xfce4-namebar-plugin = callPackage ../xfce/panel-plugins/xfce4-namebar-plugin.nix { };
 
   xfce4-windowck-plugin = callPackage ../xfce/panel-plugins/xfce4-windowck-plugin.nix { };
+
+
+  ## ALIASES
+
+  # added 2019-08-18
+  xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin";
 })
diff --git a/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix
deleted file mode 100644
index a4bc0a3eaddb..000000000000
--- a/pkgs/desktops/xfce4-14/xfce4-mixer/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf, gst-plugins-base, libunique }:
-
-let
-  gst_plugins_minimal = gst-plugins-base.override {
-    minimalDeps = true;
-  };
-in
-mkXfceDerivation rec {
-  category = "apps";
-  pname = "xfce4-mixer";
-  version = "4.11.0";
-
-  sha256 = "1kiz5ysn4rqkjfzz4dvbsfj64kqqayg7bqakcys3rw28g2q5qyys";
-
-  nativeBuildInputs = [ automakeAddFlags ];
-
-  postPatch = ''
-    automakeAddFlags panel-plugin/Makefile.am libmixer_la_CFLAGS DBUS_GLIB_CFLAGS
-    automakeAddFlags xfce4-mixer/Makefile.am xfce4_mixer_CFLAGS DBUS_GLIB_CFLAGS
-  '';
-
-  buildInputs = [
-    dbus-glib
-    gst_plugins_minimal
-    gtk2
-    libunique
-    libxfce4ui
-    libxfce4util
-    xfce4-panel
-    xfconf
-  ];
-}