diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-08 03:39:07 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-09 17:36:45 +0200 |
| commit | 200434a695c7f9608330713caad45e23465946b2 (patch) | |
| tree | a17b467716e6e9d8f11d8580644e40c51b34a89f /pkgs | |
| parent | d293fca58a8f01836758af04406ec1ff0a6d9ec0 (diff) | |
| download | nixlib-200434a695c7f9608330713caad45e23465946b2.tar nixlib-200434a695c7f9608330713caad45e23465946b2.tar.gz nixlib-200434a695c7f9608330713caad45e23465946b2.tar.bz2 nixlib-200434a695c7f9608330713caad45e23465946b2.tar.lz nixlib-200434a695c7f9608330713caad45e23465946b2.tar.xz nixlib-200434a695c7f9608330713caad45e23465946b2.tar.zst nixlib-200434a695c7f9608330713caad45e23465946b2.zip | |
xmonad_log_applet_gnome2: drop
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/window-managers/xmonad/log-applet/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
2 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index f2acf03958b6..94c23e8a6824 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib , desktopSupport -, gtk2, gnome2_panel, GConf2 +, gtk2 , libxfce4util, xfce4-panel }: -assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; +assert desktopSupport == "gnome3" || desktopSupport == "xfce4"; stdenv.mkDerivation rec { version = "2.1.0"; @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ glib dbus-glib ] - ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] # TODO: no idea where to find libpanelapplet-4.0 ++ optionals (desktopSupport == "gnome3") [ ] ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0af63a048656..ea1b022b95eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19283,25 +19283,14 @@ with pkgs; packages = self: []; }; - xmonad_log_applet_gnome2 = xmonad_log_applet.override { - desktopSupport = "gnome2"; - inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; - }; - xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { desktopSupport = "gnome3"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; xmonad_log_applet_xfce = xmonad_log_applet.override { desktopSupport = "xfce4"; inherit (xfce) libxfce4util xfce4-panel; - gnome2_panel = gnome2.gnome_panel; - GConf2 = gnome2.GConf; }; xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { }; |