Merge pull request #112366 from AndersonTorres/lxpanel

Small modification in LXDE and LXQT

pkgs/desktops/lxde/core/lxappearance/default.nix

@@ -9,10 +9,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "lxappearance-0.6.3";
+  pname = "lxappearance";
+  version = "0.6.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
+    url = "mirror://sourceforge/project/lxde/LXAppearance/${pname}-${version}.tar.xz";
     sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj";
   };
 
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Lightweight program for configuring the theme and fonts of gtk applications";
     homepage = "https://lxde.org/";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ hinton romildo ];
   };

pkgs/desktops/lxde/core/lxpanel/default.nix

@@ -1,21 +1,54 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, m4, intltool, libxmlxx, keybinder
+{ lib
-, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib
+, stdenv
-, menu-cache, lxmenu-data, wirelesstools, curl
+, fetchurl
+, pkg-config
+, gettext
+, m4
+, intltool
+, libxmlxx
+, keybinder
+, gtk2
+, libX11
+, libfm
+, libwnck
+, libXmu
+, libXpm
+, cairo
+, gdk-pixbuf
+, gdk-pixbuf-xlib
+, menu-cache
+, lxmenu-data
+, wirelesstools
+, curl
 , supportAlsa ? false, alsaLib
 }:
 
 stdenv.mkDerivation rec {
-  name = "lxpanel-0.10.0";
+  pname = "lxpanel";
+  version = "0.10.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lxde/${name}.tar.xz";
+    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
     sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26";
   };
 
   nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ];
   buildInputs = [
-    keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev
+    keybinder
-    menu-cache lxmenu-data m4 wirelesstools curl
+    gtk2
+    libX11
+    libfm
+    libwnck
+    libXmu
+    libXpm
+    cairo
+    gdk-pixbuf
+    gdk-pixbuf-xlib.dev
+    menu-cache
+    lxmenu-data
+    m4
+    wirelesstools
+    curl
   ] ++ lib.optional supportAlsa alsaLib;
 
   postPatch = ''
@@ -25,11 +58,11 @@ stdenv.mkDerivation rec {
       --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Lightweight X11 desktop panel for LXDE";
     homepage = "https://lxde.org/";
-    license = lib.licenses.gpl2;
+    license = licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.ryneeverett ];
+    maintainers = [ maintainers.ryneeverett ];
-    platforms = lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

pkgs/desktops/lxde/core/lxrandr/default.nix

@@ -1,23 +1,37 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, intltool
+, gtk2
+, libX11
+, xrandr
+, withGtk3 ? false, gtk3
+}:
 
 stdenv.mkDerivation rec {
-  name = "lxrandr-0.3.2";
+  pname = "lxrandr";
+  version = "0.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/lxde/${name}.tar.xz";
+    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
     sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb";
   };
 
   configureFlags = lib.optional withGtk3 "--enable-gtk3";
 
   nativeBuildInputs = [ pkg-config intltool ];
-  buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ];
+  buildInputs = [
+    libX11
+    xrandr
+    (if withGtk3 then gtk3 else gtk2)
+  ];
 
   meta = with lib; {
     description = "Standard screen manager of LXDE";
     homepage = "https://lxde.org/";
-    license = lib.licenses.gpl2;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ rawkode ];
-    platforms = lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

pkgs/desktops/lxde/core/lxsession/default.nix

@@ -58,9 +58,9 @@ stdenv.mkDerivation rec {
   preConfigure = "./autogen.sh";
 
   meta = with lib; {
+    homepage = "https://wiki.lxde.org/en/LXSession";
     description = "Classic LXDE session manager";
     license = licenses.gpl2Plus;
-    homepage = "https://wiki.lxde.org/en/LXSession";
     maintainers = [ maintainers.shamilton ];
     platforms = platforms.linux;
   };

pkgs/desktops/lxde/core/lxtask/default.nix

@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libintl }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, intltool
+, gtk3
+, libintl
+}:
 
 stdenv.mkDerivation rec {
   pname = "lxtask";
@@ -15,7 +22,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-gtk3" ];
 
-  meta = {
+  meta = with lib; {
+    homepage = "https://wiki.lxde.org/en/LXTask";
     description = "Lightweight and desktop independent task manager";
     longDescription = ''
       LXTask is a lightweight task manager derived from xfce4 task manager
@@ -24,9 +32,8 @@ stdenv.mkDerivation rec {
       Desktop Environment, it's totally desktop independent and only
       requires pure GTK.
     '';
-    homepage = "https://wiki.lxde.org/en/LXTask";
+    license = licenses.gpl2Plus;
-    license = lib.licenses.gpl2Plus;
+    platforms = platforms.unix;
-    platforms = lib.platforms.unix;
+    maintainers = [ maintainers.romildo ];
-    maintainers = [ lib.maintainers.romildo ];
   };
 }

pkgs/desktops/lxqt/compton-conf/default.nix

@@ -40,9 +40,9 @@ mkDerivation rec {
   passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "GUI configuration tool for compton X composite manager";
     homepage = "https://github.com/lxqt/compton-conf";
-    license = licenses.lgpl21;
+    description = "GUI configuration tool for compton X composite manager";
+    license = licenses.lgpl21Plus;
     platforms = with platforms; unix;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/libfm-qt/default.nix

@@ -46,9 +46,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Core library of PCManFM-Qt (Qt binding for libfm)";
     homepage = "https://github.com/lxqt/libfm-qt";
-    license = licenses.lgpl21;
+    description = "Core library of PCManFM-Qt (Qt binding for libfm)";
+    license = licenses.lgpl21Plus;
     platforms = with platforms; unix;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/libqtxdg/default.nix

@@ -40,9 +40,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Qt implementation of freedesktop.org xdg specs";
     homepage = "https://github.com/lxqt/libqtxdg";
-    license = licenses.lgpl21;
+    description = "Qt implementation of freedesktop.org xdg specs";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lximage-qt/default.nix

@@ -45,9 +45,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "The image viewer and screenshot tool for lxqt";
     homepage = "https://github.com/lxqt/lximage-qt";
-    license = licenses.gpl2;
+    description = "The image viewer and screenshot tool for lxqt";
+    license = licenses.gpl2Plus;
     platforms = with platforms; unix;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-about/default.nix

@@ -40,9 +40,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Dialogue window providing information about LXQt and the system it's running on";
     homepage = "https://github.com/lxqt/lxqt-about";
-    license = licenses.lgpl21;
+    description = "Dialogue window providing information about LXQt and the system it's running on";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-admin/default.nix

@@ -47,9 +47,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "LXQt system administration tool";
     homepage = "https://github.com/lxqt/lxqt-admin";
-    license = licenses.lgpl21;
+    description = "LXQt system administration tool";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-archiver/default.nix

@@ -42,9 +42,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Archive tool for the LXQt desktop environment";
     homepage = "https://github.com/lxqt/lxqt-archiver/";
-    license = licenses.gpl2;
+    description = "Archive tool for the LXQt desktop environment";
+    license = licenses.gpl2Plus;
     platforms = with platforms; unix;
     maintainers = with maintainers; [ jchw ];
   };

pkgs/desktops/lxqt/lxqt-build-tools/default.nix

@@ -44,9 +44,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Various packaging tools and scripts for LXQt applications";
     homepage = "https://github.com/lxqt/lxqt-build-tools";
-    license = licenses.lgpl21;
+    description = "Various packaging tools and scripts for LXQt applications";
+    license = licenses.lgpl21Plus;
     platforms = with platforms; unix;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-config/default.nix

@@ -58,9 +58,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Tools to configure LXQt and the underlying operating system";
     homepage = "https://github.com/lxqt/lxqt-config";
-    license = licenses.lgpl21;
+    description = "Tools to configure LXQt and the underlying operating system";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-globalkeys/default.nix

@@ -42,9 +42,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "LXQt service for global keyboard shortcuts registration";
     homepage = "https://github.com/lxqt/lxqt-globalkeys";
-    license = licenses.lgpl21;
+    description = "LXQt service for global keyboard shortcuts registration";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-notificationd/default.nix

@@ -42,9 +42,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "The LXQt notification daemon";
     homepage = "https://github.com/lxqt/lxqt-notificationd";
-    license = licenses.lgpl21;
+    description = "The LXQt notification daemon";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix

@@ -42,9 +42,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "GUI to query passwords on behalf of SSH agents";
     homepage = "https://github.com/lxqt/lxqt-openssh-askpass";
-    license = licenses.lgpl21;
+    description = "GUI to query passwords on behalf of SSH agents";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-panel/default.nix

@@ -73,9 +73,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "The LXQt desktop panel";
     homepage = "https://github.com/lxqt/lxqt-panel";
-    license = licenses.lgpl21;
+    description = "The LXQt desktop panel";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-policykit/default.nix

@@ -48,9 +48,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "The LXQt PolicyKit agent";
     homepage = "https://github.com/lxqt/lxqt-policykit";
-    license = licenses.lgpl21;
+    description = "The LXQt PolicyKit agent";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-powermanagement/default.nix

@@ -48,9 +48,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Power management module for LXQt";
     homepage = "https://github.com/lxqt/lxqt-powermanagement";
-    license = licenses.lgpl21;
+    description = "Power management module for LXQt";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-qtplugin/default.nix

@@ -47,9 +47,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "LXQt Qt platform integration plugin";
     homepage = "https://github.com/lxqt/lxqt-qtplugin";
-    license = licenses.lgpl21;
+    description = "LXQt Qt platform integration plugin";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-runner/default.nix

@@ -52,9 +52,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Tool used to launch programs quickly by typing their names";
     homepage = "https://github.com/lxqt/lxqt-runner";
-    license = licenses.lgpl21;
+    description = "Tool used to launch programs quickly by typing their names";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-session/default.nix

@@ -49,9 +49,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "An alternative session manager ported from the original razor-session";
     homepage = "https://github.com/lxqt/lxqt-session";
-    license = licenses.lgpl21;
+    description = "An alternative session manager ported from the original razor-session";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-sudo/default.nix

@@ -44,9 +44,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "GUI frontend for sudo/su";
     homepage = "https://github.com/lxqt/lxqt-sudo";
-    license = licenses.lgpl21;
+    description = "GUI frontend for sudo/su";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/lxqt-themes/default.nix

@@ -25,9 +25,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Themes, graphics and icons for LXQt";
     homepage = "https://github.com/lxqt/lxqt-themes";
-    license = licenses.lgpl21;
+    description = "Themes, graphics and icons for LXQt";
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/obconf-qt/default.nix

@@ -44,9 +44,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "The Qt port of obconf, the Openbox configuration tool";
     homepage = "https://github.com/lxqt/obconf-qt";
-    license = licenses.gpl2;
+    description = "The Qt port of obconf, the Openbox configuration tool";
+    license = licenses.gpl2Plus;
     platforms = with platforms; unix;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/pavucontrol-qt/default.nix

@@ -39,9 +39,9 @@ mkDerivation rec {
   passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
     homepage = "https://github.com/lxqt/pavucontrol-qt";
-    license = licenses.gpl2;
+    description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
+    license = licenses.gpl2Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/pcmanfm-qt/default.nix

@@ -47,9 +47,9 @@ mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
     homepage = "https://github.com/lxqt/pcmanfm-qt";
-    license = licenses.gpl2;
+    description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
+    license = licenses.gpl2Plus;
     platforms = with platforms; unix;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/qps/default.nix

@@ -40,9 +40,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Qt based process manager";
     homepage = "https://github.com/lxqt/qps";
-    license = licenses.gpl2;
+    description = "Qt based process manager";
+    license = licenses.gpl2Plus;
     platforms = with platforms; linux; # does not build on darwin
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/qterminal/default.nix

@@ -36,9 +36,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "A lightweight Qt-based terminal emulator";
     homepage = "https://github.com/lxqt/qterminal";
-    license = licenses.gpl2;
+    description = "A lightweight Qt-based terminal emulator";
+    license = licenses.gpl2Plus;
     platforms = with platforms; unix;
     maintainers = with maintainers; [ romildo globin ];
   };

pkgs/desktops/lxqt/qtermwidget/default.nix

@@ -32,9 +32,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "A terminal emulator widget for Qt 5";
     homepage = "https://github.com/lxqt/qtermwidget";
-    license = licenses.gpl2;
+    description = "A terminal emulator widget for Qt 5";
+    license = licenses.gpl2Plus;
     platforms = with platforms; unix;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/desktops/lxqt/screengrab/default.nix

@@ -45,9 +45,9 @@ mkDerivation rec {
   passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
 
   meta = with lib; {
-    description = "Crossplatform tool for fast making screenshots";
     homepage = "https://github.com/lxqt/screengrab";
-    license = licenses.gpl2;
+    description = "Crossplatform tool for fast making screenshots";
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };

pkgs/development/libraries/libfm/default.nix

@@ -8,8 +8,9 @@
 , pkg-config
 , vala
 , extraOnly ? false
-, withGtk3 ? true , gtk3, gtk2
+, withGtk3 ? false, gtk2, gtk3
 }:
+
 let
     gtk = if withGtk3 then gtk3 else gtk2;
     inherit (lib) optional;