summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2022-11-25 17:02:08 -0800
committerRobert Schütz <nix@dotlambda.de>2022-11-25 19:52:48 -0800
commite61cc2ab0265dbc52f4a8ec7b019710545e6d577 (patch)
tree2f40462b0c003441a95d68825c439e7921dc4704
parent5bb01fc84459d6d2ea14b17f75b5cd99b7f2fac6 (diff)
downloadnixpkgs-e61cc2ab0265dbc52f4a8ec7b019710545e6d577.tar
nixpkgs-e61cc2ab0265dbc52f4a8ec7b019710545e6d577.tar.gz
nixpkgs-e61cc2ab0265dbc52f4a8ec7b019710545e6d577.tar.bz2
nixpkgs-e61cc2ab0265dbc52f4a8ec7b019710545e6d577.tar.lz
nixpkgs-e61cc2ab0265dbc52f4a8ec7b019710545e6d577.tar.xz
nixpkgs-e61cc2ab0265dbc52f4a8ec7b019710545e6d577.tar.zst
nixpkgs-e61cc2ab0265dbc52f4a8ec7b019710545e6d577.zip
lxpanel: use gtk3 by default
-rw-r--r--pkgs/desktops/lxde/core/lxpanel/default.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index 1208f9cd64c..214c2b14dd2 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -7,10 +7,13 @@
 , intltool
 , libxmlxx
 , keybinder
+, keybinder3
 , gtk2
+, gtk3
 , libX11
 , libfm
 , libwnck2
+, libwnck3
 , libXmu
 , libXpm
 , cairo
@@ -21,6 +24,7 @@
 , wirelesstools
 , curl
 , supportAlsa ? false, alsa-lib
+, withGtk3 ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -34,11 +38,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ];
   buildInputs = [
-    keybinder
-    gtk2
+    (if withGtk3 then keybinder3 else keybinder)
+    (if withGtk3 then gtk3 else gtk2)
     libX11
-    libfm
-    libwnck2
+    (libfm.override { inherit withGtk3; })
+    (if withGtk3 then libwnck3 else libwnck2)
     libXmu
     libXpm
     cairo
@@ -58,6 +62,8 @@ stdenv.mkDerivation rec {
       --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
   '';
 
+  configureFlags = lib.optional withGtk3 "--enable-gtk3";
+
   meta = with lib; {
     description = "Lightweight X11 desktop panel for LXDE";
     homepage = "https://lxde.org/";