From 5abed165e076f96207f6c38d0b1584610c10c22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 25 Apr 2020 14:01:05 -0300 Subject: [PATCH] lxqt: format nix expressions with nixpkgs-fmt --- pkgs/desktops/lxqt/compton-conf/default.nix | 14 +++- pkgs/desktops/lxqt/default.nix | 65 +++++++++---------- pkgs/desktops/lxqt/libfm-qt/default.nix | 17 +++-- pkgs/desktops/lxqt/liblxqt/default.nix | 15 ++++- pkgs/desktops/lxqt/libqtxdg/default.nix | 19 +++++- pkgs/desktops/lxqt/libsysstat/default.nix | 17 ++++- pkgs/desktops/lxqt/lximage-qt/default.nix | 16 ++++- pkgs/desktops/lxqt/lxqt-about/default.nix | 13 +++- pkgs/desktops/lxqt/lxqt-admin/default.nix | 14 +++- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 13 +++- .../lxqt/lxqt-build-tools/default.nix | 22 ++++++- pkgs/desktops/lxqt/lxqt-config/default.nix | 19 +++++- .../desktops/lxqt/lxqt-globalkeys/default.nix | 14 +++- .../lxqt/lxqt-notificationd/default.nix | 14 +++- .../lxqt/lxqt-openssh-askpass/default.nix | 14 +++- pkgs/desktops/lxqt/lxqt-panel/default.nix | 34 ++++++++-- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 19 ++++-- .../lxqt/lxqt-powermanagement/default.nix | 16 ++++- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 16 +++-- pkgs/desktops/lxqt/lxqt-runner/default.nix | 20 +++++- pkgs/desktops/lxqt/lxqt-session/default.nix | 17 ++++- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 15 ++++- pkgs/desktops/lxqt/lxqt-themes/default.nix | 7 +- pkgs/desktops/lxqt/obconf-qt/default.nix | 15 ++++- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 14 +++- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 15 ++++- pkgs/desktops/lxqt/qlipper/default.nix | 17 ++++- pkgs/desktops/lxqt/qps/default.nix | 24 +++++-- pkgs/desktops/lxqt/qterminal/default.nix | 12 +++- pkgs/desktops/lxqt/qtermwidget/default.nix | 19 +++++- pkgs/desktops/lxqt/screengrab/default.nix | 15 ++++- 31 files changed, 458 insertions(+), 103 deletions(-) diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index fe44b707f76e..30b4dd95a672 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -1,5 +1,13 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, - libconfig }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, lxqt +, libconfig +}: mkDerivation rec { pname = "compton-conf"; @@ -27,7 +35,7 @@ mkDerivation rec { preConfigure = '' substituteInPlace autostart/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ - ''; + ''; meta = with lib; { description = "GUI configuration tool for compton X composite manager"; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 6b03c2a6c9e8..b3c38a8e4fa5 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -1,5 +1,4 @@ { pkgs, makeScope, libsForQt5 }: - let packages = self: with self; { @@ -7,42 +6,42 @@ let # - https://github.com/lxqt/lxqt/wiki/Building-from-source ### BASE - libqtxdg = callPackage ./libqtxdg { }; - lxqt-build-tools = callPackage ./lxqt-build-tools { }; - libsysstat = callPackage ./libsysstat { }; - liblxqt = callPackage ./liblxqt { }; + libqtxdg = callPackage ./libqtxdg {}; + lxqt-build-tools = callPackage ./lxqt-build-tools {}; + libsysstat = callPackage ./libsysstat {}; + liblxqt = callPackage ./liblxqt {}; ### CORE 1 - libfm-qt = callPackage ./libfm-qt { }; - lxqt-about = callPackage ./lxqt-about { }; - lxqt-admin = callPackage ./lxqt-admin { }; - lxqt-config = callPackage ./lxqt-config { }; - lxqt-globalkeys = callPackage ./lxqt-globalkeys { }; - lxqt-notificationd = callPackage ./lxqt-notificationd { }; - lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { }; - lxqt-policykit = callPackage ./lxqt-policykit { }; - lxqt-powermanagement = callPackage ./lxqt-powermanagement { }; - lxqt-qtplugin = callPackage ./lxqt-qtplugin { }; - lxqt-session = callPackage ./lxqt-session { }; - lxqt-sudo = callPackage ./lxqt-sudo { }; - lxqt-themes = callPackage ./lxqt-themes { }; - pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { }; - qtermwidget = callPackage ./qtermwidget { }; + libfm-qt = callPackage ./libfm-qt {}; + lxqt-about = callPackage ./lxqt-about {}; + lxqt-admin = callPackage ./lxqt-admin {}; + lxqt-config = callPackage ./lxqt-config {}; + lxqt-globalkeys = callPackage ./lxqt-globalkeys {}; + lxqt-notificationd = callPackage ./lxqt-notificationd {}; + lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass {}; + lxqt-policykit = callPackage ./lxqt-policykit {}; + lxqt-powermanagement = callPackage ./lxqt-powermanagement {}; + lxqt-qtplugin = callPackage ./lxqt-qtplugin {}; + lxqt-session = callPackage ./lxqt-session {}; + lxqt-sudo = callPackage ./lxqt-sudo {}; + lxqt-themes = callPackage ./lxqt-themes {}; + pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt {}; + qtermwidget = callPackage ./qtermwidget {}; ### CORE 2 - lxqt-panel = callPackage ./lxqt-panel { }; - lxqt-runner = callPackage ./lxqt-runner { }; - pcmanfm-qt = callPackage ./pcmanfm-qt { }; + lxqt-panel = callPackage ./lxqt-panel {}; + lxqt-runner = callPackage ./lxqt-runner {}; + pcmanfm-qt = callPackage ./pcmanfm-qt {}; ### OPTIONAL - qterminal = callPackage ./qterminal { }; - compton-conf = pkgs.qt5.callPackage ./compton-conf { }; - obconf-qt = callPackage ./obconf-qt { }; - lximage-qt = callPackage ./lximage-qt { }; - qps = callPackage ./qps { }; - screengrab = callPackage ./screengrab { }; - qlipper = callPackage ./qlipper { }; - lxqt-archiver = callPackage ./lxqt-archiver { }; + qterminal = callPackage ./qterminal {}; + compton-conf = pkgs.qt5.callPackage ./compton-conf {}; + obconf-qt = callPackage ./obconf-qt {}; + lximage-qt = callPackage ./lximage-qt {}; + qps = callPackage ./qps {}; + screengrab = callPackage ./screengrab {}; + qlipper = callPackage ./qlipper {}; + lxqt-archiver = callPackage ./lxqt-archiver {}; preRequisitePackages = [ pkgs.gvfs # virtual file systems support for PCManFM-QT @@ -107,5 +106,5 @@ let ]; }; - -in makeScope libsForQt5.newScope packages +in +makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index d383b46a9aed..f0c2c232786f 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -1,7 +1,16 @@ -{ - lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - pcre, libexif, xorg, libfm, menu-cache, - qtx11extras, qttools +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, pcre +, libexif +, xorg +, libfm +, menu-cache +, qtx11extras +, qttools }: mkDerivation rec { diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index ec7fe0a76652..2c69642f84f5 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -1,5 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, - qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, libqtxdg +, polkit-qt +, kwindowsystem +, xorg +}: mkDerivation rec { pname = "liblxqt"; diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 14bb21e14695..6009047d823d 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -1,4 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qtsvg +, lxqt-build-tools +}: mkDerivation rec { pname = "libqtxdg"; @@ -11,9 +18,15 @@ mkDerivation rec { sha256 = "16jqnpc740a6phq7vcgy85hl7253yzyw4m5h71r0vijk79ir73b5"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qtsvg ]; + buildInputs = [ + qtbase + qtsvg + ]; preConfigure = '' cmakeFlagsArray+=( diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 0e63d32c746e..cfbf7c3c72e6 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -1,4 +1,10 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, lxqt-build-tools +}: mkDerivation rec { pname = "libsysstat"; @@ -11,9 +17,14 @@ mkDerivation rec { sha256 = "10h9n7km7yx8bnmzxi4nn1yqq03hizjkrx4745j0mczy7niiffsz"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase ]; + buildInputs = [ + qtbase + ]; meta = with lib; { description = "Library used to query system info and statistics"; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index e47a9ec1b48a..0a1cf72e452d 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -1,5 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, - qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, qtx11extras +, qtsvg +, xorg +, lxqt-build-tools +, libfm-qt +, libexif +}: mkDerivation rec { pname = "lximage-qt"; diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 19a06925b3ed..a6df2c1f3212 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -1,4 +1,15 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +}: mkDerivation rec { pname = "lxqt-about"; diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 0a9ef8cfb840..db78f66e36af 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -1,4 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, polkit-qt +}: mkDerivation rec { pname = "lxqt-admin"; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 2c4d040a432b..481e2faad449 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -1,4 +1,15 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, json-glib +, libfm-qt +, qtbase +, qttools +, qtx11extras +}: mkDerivation rec { # pname = "lxqt-archiver"; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index d06cb7be9286..559695bfa30d 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,4 +1,12 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, pcre +, qtbase +, glib +}: mkDerivation rec { pname = "lxqt-build-tools"; @@ -11,9 +19,17 @@ mkDerivation rec { sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2"; }; - nativeBuildInputs = [ cmake pkgconfig setupHook ]; + nativeBuildInputs = [ + cmake + pkgconfig + setupHook + ]; - buildInputs = [ qtbase glib pcre ]; + buildInputs = [ + qtbase + glib + pcre + ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 41fe965161db..11629bfad4bc 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,6 +1,19 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, - qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, - libqtxdg, xorg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, libkscreen +, liblxqt +, libqtxdg +, xorg +}: mkDerivation rec { pname = "lxqt-config"; diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index ca760d2a090c..b6d8a06a0a66 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -1,4 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +}: mkDerivation rec { pname = "lxqt-globalkeys"; diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 5790be3c77f5..913ba88cc749 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -1,4 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, qtx11extras +}: mkDerivation rec { pname = "lxqt-notificationd"; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 26730f57b43e..87b2f5f325cb 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -1,4 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, qtx11extras +, kwindowsystem +, liblxqt +, libqtxdg +}: mkDerivation rec { pname = "lxqt-openssh-askpass"; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 57938a5f521f..f6302e37f061 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -1,10 +1,30 @@ -{ - lib, mkDerivation, fetchFromGitHub, - cmake, pkgconfig, lxqt-build-tools, - qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, - kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, - xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data, pcre, libXdamage +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, libdbusmenu +, kwindowsystem +, solid +, kguiaddons +, liblxqt +, libqtxdg +, lxqt-globalkeys +, libsysstat +, xorg +, libstatgrab +, lm_sensors +, libpulseaudio +, alsaLib +, menu-cache +, lxmenu-data +, pcre +, libXdamage }: mkDerivation rec { diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 33a2d517fa41..13392e8ce0c9 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -1,7 +1,18 @@ -{ - lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt, - libqtxdg, pcre +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, polkit-qt +, kwindowsystem +, liblxqt +, libqtxdg +, pcre }: mkDerivation rec { diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 997a9cda3d97..d0922d51cc68 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -1,4 +1,18 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, solid +, kidletime +, liblxqt +, libqtxdg +}: mkDerivation rec { pname = "lxqt-powermanagement"; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index abb09aae838f..25b752def238 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -1,7 +1,15 @@ -{ - lib, mkDerivation, fetchFromGitHub, - cmake, lxqt-build-tools, - qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qtx11extras +, qttools +, qtsvg +, libdbusmenu +, libqtxdg +, libfm-qt }: mkDerivation rec { diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index e4f39184ffdf..03e6538c21cb 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -1,5 +1,21 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras, -menu-cache, muparser, pcre }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, lxqt-globalkeys +, qtx11extras +, menu-cache +, muparser +, pcre +}: mkDerivation rec { pname = "lxqt-runner"; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 0493dd9fbb13..74ce0afd8923 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -1,4 +1,19 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, qtx11extras +, kwindowsystem +, liblxqt +, libqtxdg +, xorg +, xdg-user-dirs +}: mkDerivation rec { pname = "lxqt-session"; diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 9c76f0383b57..ef85a9a45e28 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -1,4 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, sudo +}: mkDerivation rec { pname = "lxqt-sudo"; diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 1cc56d62a06e..d00c91f51a83 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -1,4 +1,9 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +}: mkDerivation rec { pname = "lxqt-themes"; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 1b1e2e92b0fb..52574ea3bad1 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -1,5 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools, - qtx11extras, xorg, lxqt-build-tools, openbox }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, pcre +, qtbase +, qttools +, qtx11extras +, xorg +, lxqt-build-tools +, openbox +}: mkDerivation rec { pname = "obconf-qt"; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 308077bc0992..3eff3ec7fe32 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -1,5 +1,15 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, - pcre, qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt +, libpulseaudio +, pcre +, qtbase +, qttools +, qtx11extras +}: mkDerivation rec { pname = "pavucontrol-qt"; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index b294cdf52ab0..1ac853bd7017 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -1,5 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools, - qtx11extras, libfm-qt, menu-cache, lxmenu-data }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt +, qtbase +, qttools +, qtx11extras +, libfm-qt +, menu-cache +, lxmenu-data +}: mkDerivation rec { pname = "pcmanfm-qt"; diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index d5da4737f8f2..ce32f8e9123a 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -1,4 +1,10 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qttools +}: mkDerivation rec { pname = "qlipper"; @@ -11,9 +17,14 @@ mkDerivation rec { sha256 = "0vlm4ab9isi7i2bimnyrk6083j2dfdrs14qj59vjcjri7mcwmf76"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ + qtbase + qttools + ]; meta = with lib; { description = "Cross-platform clipboard history applet"; diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index cba01522de01..f68cadea9a2a 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -1,5 +1,12 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools, - lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qtx11extras +, qttools +, lxqt-build-tools +}: mkDerivation rec { pname = "qps"; @@ -12,15 +19,22 @@ mkDerivation rec { sha256 = "03rl59yk3b24j0y0k8dpdpb3yi4f1l642zn5pp5br3s2vwx1vzkg"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qtx11extras qttools ]; + buildInputs = [ + qtbase + qtx11extras + qttools + ]; meta = with lib; { description = "Qt based process manager"; homepage = "https://github.com/lxqt/qps"; license = licenses.gpl2; - platforms = with platforms; linux; # does not build on darwin + platforms = with platforms; linux; # does not build on darwin maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 2b4844654b01..02464cc3e4d7 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -1,5 +1,13 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, - qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtermwidget +, qtbase +, qttools +, qtx11extras +}: mkDerivation rec { pname = "qterminal"; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index d20d4445c252..900aec9db8af 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -1,4 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qttools +, lxqt-build-tools +}: mkDerivation rec { pname = "qtermwidget"; @@ -11,9 +18,15 @@ mkDerivation rec { sha256 = "1pz8dwb86jpga4vfyn5v9n2s6dx3zh74yfp1kjsmsmhf878zs6lv"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ + qtbase + qttools + ]; meta = with lib; { description = "A terminal emulator widget for Qt 5"; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 7eff539091fc..99d6af06d4f9 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -1,4 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, libqtxdg +, xorg +, autoPatchelfHook +}: mkDerivation rec { pname = "screengrab";