public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xmonad_log_applet_gnome2: drop

Browse Source
This commit is contained in:
Jan Tojnar 2018-08-08 03:39:07 +02:00
parent d293fca58a
commit 200434a695
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/window-managers/xmonad/log-applet/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib
, desktopSupport , desktopSupport
, gtk2, gnome2_panel, GConf2 , gtk2
, libxfce4util, xfce4-panel , libxfce4util, xfce4-panel
}: }:
assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; assert desktopSupport == "gnome3" || desktopSupport == "xfce4";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.1.0"; version = "2.1.0";
@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ glib dbus-glib ] [ glib dbus-glib ]
++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ]
# TODO: no idea where to find libpanelapplet-4.0 # TODO: no idea where to find libpanelapplet-4.0
++ optionals (desktopSupport == "gnome3") [ ] ++ optionals (desktopSupport == "gnome3") [ ]
++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]

11
pkgs/top-level/all-packages.nix
View File

@ -19283,25 +19283,14 @@ with pkgs;
packages = self: []; 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 { xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet {
desktopSupport = "gnome3"; desktopSupport = "gnome3";
inherit (xfce) libxfce4util xfce4-panel; inherit (xfce) libxfce4util xfce4-panel;
gnome2_panel = gnome2.gnome_panel;
GConf2 = gnome2.GConf;
}; };
xmonad_log_applet_xfce = xmonad_log_applet.override { xmonad_log_applet_xfce = xmonad_log_applet.override {
desktopSupport = "xfce4"; desktopSupport = "xfce4";
inherit (xfce) libxfce4util xfce4-panel; inherit (xfce) libxfce4util xfce4-panel;
gnome2_panel = gnome2.gnome_panel;
GConf2 = gnome2.GConf;
}; };
xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { }; xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { };