diff options
Diffstat (limited to 'pkgs/desktops/lxqt')
31 files changed, 204 insertions, 151 deletions
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index b41d766c1ad..111f7f175da 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , qtbase , qttools , lxqt @@ -11,18 +11,18 @@ mkDerivation rec { pname = "compton-conf"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1wqnajarkrpmc60jr1zw5w39lvlf9ii4ri9wgyn55hh1rkbzi7py"; + sha256 = "0gcvyn7aabdz5yj0jzv14hlgjgbm8d9ib5r73i842f0hv4cv9m0q"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt.lxqt-build-tools ]; @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 45714260381..062ca4abfe8 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -1,4 +1,4 @@ -{ pkgs, makeScope, libsForQt5 }: +{ pkgs, makeScope, libsForQt5, qt5 }: let packages = self: with self; { @@ -43,7 +43,7 @@ let ### OPTIONAL qterminal = callPackage ./qterminal {}; - compton-conf = pkgs.qt5.callPackage ./compton-conf {}; + compton-conf = qt5.callPackage ./compton-conf {}; obconf-qt = callPackage ./obconf-qt {}; lximage-qt = callPackage ./lximage-qt {}; qps = callPackage ./qps {}; @@ -52,15 +52,14 @@ let lxqt-archiver = callPackage ./lxqt-archiver {}; preRequisitePackages = [ - pkgs.gvfs # virtual file systems support for PCManFM-QT - pkgs.libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel - pkgs.libsForQt5.libkscreen # provides plugins for screen management software + libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel + libsForQt5.libkscreen # provides plugins for screen management software pkgs.libfm pkgs.libfm-extra pkgs.lxmenu-data pkgs.menu-cache pkgs.openbox # default window manager - pkgs.qt5.qtsvg # provides QT5 plugins for svg icons + qt5.qtsvg # provides QT5 plugins for svg icons ]; corePackages = [ @@ -107,7 +106,7 @@ let qlipper ### Default icon theme - pkgs.oxygen-icons5 + libsForQt5.oxygen-icons5 ### Screen saver pkgs.xscreensaver diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index fc97906ab7d..c28d069d5f1 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , pcre , libexif @@ -16,18 +16,18 @@ mkDerivation rec { pname = "libfm-qt"; - version = "0.15.1"; + version = "0.17.1"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "1gjxml6c9m3xn094zbr9835sr4749dpxk4nc0ap9lg27qim63gx3"; + sha256 = "0jdsqvwp81y4ylabrqdc673x80fp41rpp5w7c1v9zmk9k8z4s5ll"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index bd8181d57f6..b7aa5d95eaf 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "liblxqt"; - version = "0.15.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "01vfy7r7h0c5axlwqwsxg3pzdlaicnf2474bcq3jwk12gipvj5sd"; + sha256 = "0n0pjz5wihchfcji8qal0lw8kzvv3im50v1lbwww4ymrgacz9h4l"; }; nativeBuildInputs = [ @@ -39,7 +39,14 @@ mkDerivation rec { xorg.libXScrnSaver ]; + # convert name of wrapped binary, e.g. .lxqt-whatever-wrapped to the original name, e.g. lxqt-whatever so binaries can find their resources + patches = [ ./fix-application-path.patch ]; + postPatch = '' + # https://github.com/NixOS/nixpkgs/issues/119766 + substituteInPlace lxqtbacklight/linux_backend/driver/libbacklight_backend.c \ + --replace "pkexec lxqt-backlight_backend" "pkexec $out/bin/lxqt-backlight_backend" + sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt ''; diff --git a/pkgs/desktops/lxqt/liblxqt/fix-application-path.patch b/pkgs/desktops/lxqt/liblxqt/fix-application-path.patch new file mode 100644 index 00000000000..12ef97db5d8 --- /dev/null +++ b/pkgs/desktops/lxqt/liblxqt/fix-application-path.patch @@ -0,0 +1,23 @@ +--- a/lxqtapplication.cpp ++++ b/lxqtapplication.cpp +@@ -77,7 +77,7 @@ Application::Application(int &argc, char** argv, bool handleQuitSignals) + + void Application::updateTheme() + { +- const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName(); ++ const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName().mid(1).chopped(8); + setStyleSheet(lxqtTheme.qss(styleSheetKey)); + Q_EMIT themeChanged(); + } + +--- a/lxqttranslator.cpp ++++ b/lxqttranslator.cpp +@@ -147,7 +147,7 @@ bool Translator::translateApplication(const QString &applicationName) + if (!applicationName.isEmpty()) + return translate(applicationName); + else +- return translate(QFileInfo(QCoreApplication::applicationFilePath()).baseName()); ++ return translate(QFileInfo(QCoreApplication::applicationFilePath()).baseName().mid(1).chopped(8)); + } + + diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index f5da7a4b235..7abaed7c09a 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libqtxdg"; - version = "3.5.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "00dzs6zc8prc0mxmvq0pmpy1qi8rysg97as7jfd0ndk5jii0nd85"; + sha256 = "1x806hdics3d49ys0a2vkln9znidj82qscjnpcqxclxn26xqzd91"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 642b57fe0d7..8da7675d485 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "libsysstat"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1dlshyv7pd7gwl55rd3msppjdpz2pwp5f4da9a9wapg7kiskqahf"; + sha256 = "14q55iayygmjh63zgsb9qa4af766gj9b0jsrmfn85fdiqb8p8yfz"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 22ce26526ac..10e40f4ed9d 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , qtbase , qttools , qtx11extras @@ -16,18 +16,18 @@ mkDerivation rec { pname = "lximage-qt"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1pz0ird5vyrz1xycfn2vqh628f2mzwrx0psnp4hqdmj1xk9bjkbp"; + sha256 = "1xajsblk2954crvligvrgwp7q1pj7124xdfnlq9k9q0ya2xc36lx"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 01365129467..08e21736125 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-about"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0bgwh9jbvpnsdcij0bfkgzg0pb0ljjalv65q4q0hlha430pmpv3x"; + sha256 = "011jcab47iif741azfgvf52my118nwkny5m0pa7nsqyv8ad1fsiw"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 21a637bc669..a3fd034e336 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-admin"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "16fbnlvla8lq6rkv5gpmkw2jj9h1wzd3jcf8sjrbns6ygyfdxx3a"; + sha256 = "1xi169gz1sarv7584kg33ymckqlx9ddci7r9m0dlm4a7mw7fm0lf"; }; nativeBuildInputs = [ @@ -40,16 +40,19 @@ mkDerivation rec { ]; postPatch = '' - sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \ - -i lxqt-admin-user/CMakeLists.txt + for f in lxqt-admin-{time,user}/CMakeLists.txt; do + substituteInPlace $f --replace \ + "\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" \ + "$out/share/polkit-1/actions" + done ''; 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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 93e5ffec2a0..348ee3423de 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , json-glib , libfm-qt @@ -14,18 +14,18 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - sha256 = "1cip2dbvxbdlx1axz5sn4mwigwvfxb1q14byn09crv71adyfprw5"; + sha256 = "0wpayzcyqcnvzk95bqql7p07l8p7mwdgdj7zlbcsdn0wis4yhjm6"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 92ce3c2fe50..fb2ed9e37d7 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,28 +1,37 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pcre , qtbase , glib +, perl , lxqtUpdateScript }: mkDerivation rec { pname = "lxqt-build-tools"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "18l1w9lyf3nyj05wjhaj4lclak6qydlhw9bqi6kxgr1bv8k709lf"; + sha256 = "0zhcv6cbdn9fr5lpglz26gzssbxkpi824sgc0g7w3hh1z6nqqf8l"; }; + # Nix clang on darwin identifies as 'Clang', not 'AppleClang' + # Without this, dependants fail to link. + postPatch = '' + substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \ + --replace AppleClang Clang + ''; + nativeBuildInputs = [ cmake - pkgconfig + pkg-config setupHook ]; @@ -32,6 +41,10 @@ mkDerivation rec { pcre ]; + propagatedBuildInputs = [ + perl # needed by LXQtTranslateDesktop.cmake + ]; + setupHook = ./setup-hook.sh; # We're dependent on this macro doing add_definitions in most places @@ -44,9 +57,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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 677b90b25c5..5913ec7a0d0 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qtx11extras @@ -18,18 +18,18 @@ mkDerivation rec { pname = "lxqt-config"; - version = "0.15.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1nqkc716rl4c0rad4vqlqadm6lljrhwpdflaa5k9lrdiingr0s7s"; + sha256 = "0b9jihmsqgdfdsisz15j3p53fgf1w30s8irj9zjh52fsj58p924p"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 59e2096dea4..6dab1cbf736 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "09vib713zbmnwicijycl3n9q35l45lrcw129lf9z95s3ch81x1hm"; + sha256 = "135292l8w9sngg437n1zigkap15apifyqd9847ln84bxsmcj8lay"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 43f9bf31932..093706fd6ee 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-notificationd"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0vqk1rc4fn2s0ls6sl03vzsb16xczrxab4rzjim3azm4pwsxjd1k"; + sha256 = "1r2cmxcjkm9lvb2ilq2winyqndnamsd9x2ynmfiqidby2pcr9i3a"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index a164571800a..a6fbfc2f562 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "056bj3ssp4vqapzqg3da3m95vi92043j7mv70lmpznxdwyjwgxc3"; + sha256 = "18pn7kw9aw7859jnwvjnjcvr50pqsi8gqcxsbx9rvsjrybw2qcgc"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index a0bdd9bfae6..34578e6bc5f 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -2,8 +2,8 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig -, alsaLib +, pkg-config +, alsa-lib , kguiaddons , kwindowsystem , libXdamage @@ -30,23 +30,23 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "0.15.1"; + version = "0.17.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0f3sjzkria61nz342daxps2w57wnx6laq9iww8hha7rbi24yw2sd"; + sha256 = "1wmm4sml7par5z9xcs5qx2y2pdbnnh66zs37jhx9f9ihcmh1sqlw"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; buildInputs = [ - alsaLib + alsa-lib kguiaddons kwindowsystem libXdamage @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 7575c805a31..0a84799d372 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -2,12 +2,13 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qttools , qtx11extras , qtsvg +, polkit , polkit-qt , kwindowsystem , liblxqt @@ -18,18 +19,18 @@ mkDerivation rec { pname = "lxqt-policykit"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "001zgjxgvzp7clfqr46sx8m3a7v38xxgxjqrpz01lxx18zik3d9h"; + sha256 = "15f0hnif8zs38qgckif63dds9zgpp3dmg9pg3ppgh664lkbxx7n7"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; @@ -38,6 +39,7 @@ mkDerivation rec { qttools qtx11extras qtsvg + polkit polkit-qt kwindowsystem liblxqt @@ -48,9 +50,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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 2b48a2a04b5..3713bcf0bb5 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -12,18 +12,19 @@ , kidletime , liblxqt , libqtxdg +, lxqt-globalkeys , lxqtUpdateScript }: mkDerivation rec { pname = "lxqt-powermanagement"; - version = "0.15.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0gqxy4d05gibsvq27qdfwp5v19310l0ln4bvwaan6ailbyyya90f"; + sha256 = "04prx15l05kw97mwajc8yi2s7p3n6amzs5jnnmh9payxzp6glzmk"; }; nativeBuildInputs = [ @@ -41,14 +42,15 @@ mkDerivation rec { kidletime liblxqt libqtxdg + lxqt-globalkeys ]; 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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 7bdd628f458..3095b239926 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-qtplugin"; - version = "0.15.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0if01bdhz8ph4k1mwvjjjw0fw6mxzprgz17ap23xbsdr009hxdf0"; + sha256 = "168ii015j57hkccdh27h2fdh8yzs8nzy8nw20wnx6fbcg5401666"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 8a27ef41610..32d9194be67 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qttools @@ -20,18 +20,18 @@ mkDerivation rec { pname = "lxqt-runner"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1x6s4k27cvj2k51hwpcp3l686c2am504ckry4fm76h0mlnkffjm5"; + sha256 = "167gzn6aqk7akzbmrnm7nmcpkl0nphr8axbfgwnw552dnk6v8gn0"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 2e513b23988..b62ca157eeb 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt-build-tools , qtbase , qttools @@ -11,6 +11,7 @@ , kwindowsystem , liblxqt , libqtxdg +, procps , xorg , xdg-user-dirs , lxqtUpdateScript @@ -18,18 +19,18 @@ mkDerivation rec { pname = "lxqt-session"; - version = "0.15.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0kbk13dpmr75yd905n30k51cl7srrxz31ma4kacx450qgr5rwawn"; + sha256 = "1nhw3y3dm4crawc1905l6drn0i79fs1dzs8iak0vmmplbiv3fvgg"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; @@ -41,6 +42,7 @@ mkDerivation rec { kwindowsystem liblxqt libqtxdg + procps xorg.libpthreadstubs xorg.libXdmcp xdg-user-dirs @@ -49,9 +51,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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 5f8fbcd2a6a..4daf40197e8 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lxqt-sudo"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1j8pxqxb2c10hrfq34nfx75pc0cz6044j4w458nnxbgvl5b8cdcb"; + sha256 = "10s8k83mkqiakh18mh1l7idjp95cy49rg8dh14cy159dk8mchcd0"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 4613017b8a9..985e84d03c2 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "lxqt-themes"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1magzckhgrac2b5jm83hj3s8x4hyfnbh2v86lfa4c36whnfvsz29"; + sha256 = "13zh5yrq0f96cn5m6i7zdvgb9iw656fad5ps0s2zx6x8mj2mv64f"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 91baba60d8a..18d3f9899b4 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , pcre , qtbase , qttools @@ -15,18 +15,18 @@ mkDerivation rec { pname = "obconf-qt"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "13bah70k78kscrr01z7dwdzwhay8mz0f7gfsg2a6w113mgqkn7ib"; + sha256 = "1nw2r3h7ynmygpslnzjn40vvickd988nm31wy2b645xcck89q4rm"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt-build-tools ]; @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 24343d42374..662930e4e37 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt , libpulseaudio , pcre @@ -13,18 +13,18 @@ mkDerivation rec { pname = "pavucontrol-qt"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0ppm79c6pkz2hvs1rri55d3s46j6r0vhiv634wzap9qshjb1j367"; + sha256 = "0syc4bc2k7961la2c77787akhcljspq3s2nyqvb7mq7ddq1xn0wx"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt.lxqt-build-tools ]; @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 599dd67828c..ba913cd147f 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , lxqt , qtbase , qttools @@ -15,18 +15,18 @@ mkDerivation rec { pname = "pcmanfm-qt"; - version = "0.15.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "12rzcv5n4s299c8787islkn4xcjb9bbrj12mxcd5ii91jq39aii4"; + sha256 = "1awyncpypygsrg7d2nc6xh1l4xaln3ypdliy4xmq8bf94sh9rf0y"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config lxqt.lxqt-build-tools ]; @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 7ef9db40f7c..0a4918190b0 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "qps"; - version = "2.1.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0jg7sfhdm5xsahzcw8hc2vpp5p3sqzdqwp4my65nj85i7wzgxmva"; + sha256 = "0fihhnb7vp6x072spg1fnxaip4sq9mbvhrfqdwnzph5dlyvs54nj"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index c7bcf6dad3b..d383703199a 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qterminal"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1vna0fvdasrdx7l5zxaaxi1v9fy34g2qblgkdhpczxivnmmxm5a3"; + sha256 = "0mdcz45faj9ysw725qzg572968kf5sh6zfw7iiksi26s8kiyhbbp"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index fc3fb4a5db0..94a9c651cc8 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "qtermwidget"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "07wvcc650998yav9hr4hpm842j0iqdvls3mn9n2n4v8xvm7cii2m"; + sha256 = "0pmkk2mba8z6cgfsd8sy4vhf5d9fn9hvxszzyycyy1ndygjrc1v8"; }; nativeBuildInputs = [ @@ -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 ]; }; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 6a2e14fa50d..0ed305403b1 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -2,13 +2,14 @@ , mkDerivation , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , qtbase , qttools , qtx11extras , qtsvg , kwindowsystem , libqtxdg +, perl , xorg , autoPatchelfHook , lxqtUpdateScript @@ -16,18 +17,19 @@ mkDerivation rec { pname = "screengrab"; - version = "2.0.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "07wm9q0nkrvmyb12kvh0709qrwizlxgy6i5j2czhb4giljrpr4x6"; + sha256 = "16dycq40lbvk6jvpj7zp85m23cgvh8nj38fz99gxjfzn2nz1gy4a"; }; nativeBuildInputs = [ cmake - pkgconfig + pkg-config + perl # needed by LXQtTranslateDesktop.cmake autoPatchelfHook # fix libuploader.so and libextedit.so not found ]; @@ -45,9 +47,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 ]; }; |