summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2019-02-03 15:32:21 +0000
committerJan Malakhovski <oxij@oxij.org>2019-02-03 15:32:21 +0000
commit69048c4357fdc3356983bd929dd25cdacbb171b2 (patch)
tree7354a9511f807f3418644010097e169b507a36e7 /pkgs
parent40cde4d5d7a3a908430299d0473ab647f1369908 (diff)
downloadnixpkgs-69048c4357fdc3356983bd929dd25cdacbb171b2.tar
nixpkgs-69048c4357fdc3356983bd929dd25cdacbb171b2.tar.gz
nixpkgs-69048c4357fdc3356983bd929dd25cdacbb171b2.tar.bz2
nixpkgs-69048c4357fdc3356983bd929dd25cdacbb171b2.tar.lz
nixpkgs-69048c4357fdc3356983bd929dd25cdacbb171b2.tar.xz
nixpkgs-69048c4357fdc3356983bd929dd25cdacbb171b2.tar.zst
nixpkgs-69048c4357fdc3356983bd929dd25cdacbb171b2.zip
xmonad_log_applet: move defaults to package file, cleanup
These are already inherited in the parent derivation.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/window-managers/xmonad/log-applet/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
index 57f00887103..f7ccda27389 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib
-, desktopSupport, xorg
+, desktopSupport ? "gnomeflashback", xorg
 , gtk2
 , gtk3, gnome3, mate
 , libxfce4util, xfce4-panel
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ce4dcc02e0..9e2b784994a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20151,18 +20151,15 @@ in
   };
 
   xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet {
-    desktopSupport = "gnomeflashback";
     inherit (xfce) libxfce4util xfce4-panel;
   };
 
   xmonad_log_applet_mate = xmonad_log_applet.override {
     desktopSupport = "mate";
-    inherit (xfce) libxfce4util xfce4-panel;
   };
 
   xmonad_log_applet_xfce = xmonad_log_applet.override {
     desktopSupport = "xfce4";
-    inherit (xfce) libxfce4util xfce4-panel;
   };
 
   xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { };