colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #305107 from romildo/upd.lxqt 

LXQt: update to version 2.0.0
This commit is contained in:
José Romildo Malaquias 2024-04-19 17:22:32 -03:00 committed by GitHub
parent d31751f63b ba114a6c5b
commit f0c15cd749
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
39 changed files with 548 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/lxqt.nix
View File

@ -71,7 +71,7 @@ in
services.xserver.libinput.enable = mkDefault true;
xdg.portal.lxqt.enable = true;
xdg.portal.lxqt.enable = mkDefault true;
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050804
xdg.portal.config.lxqt.default = mkDefault [ "lxqt" "gtk" ];

2
pkgs/desktops/deepin/apps/deepin-terminal/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
qttools
pkg-config
wrapQtAppsHook
lxqt.lxqt-build-tools
lxqt.lxqt-build-tools_0_13
];
buildInputs = [

2
pkgs/desktops/deepin/library/qt5integration/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
qtsvg
qtx11extras
mtdev
lxqt.libqtxdg
lxqt.libqtxdg_3_12
xorg.xcbutilrenderutil
gtest
];

21
pkgs/desktops/lxqt/compton-conf/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv
, lib
, mkDerivation
{ lib
, stdenv
, fetchFromGitHub
, cmake
, libconfig
, lxqt-build-tools
, pkg-config
, qtbase
, qttools
, lxqt
, libconfig
, qtx11extras
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "compton-conf";
version = "0.16.0";
@ -24,19 +25,21 @@ mkDerivation rec {
nativeBuildInputs = [
cmake
lxqt-build-tools
pkg-config
lxqt.lxqt-build-tools
qttools
qtx11extras
wrapQtAppsHook
];
buildInputs = [
qtbase
libconfig
qtbase
];
preConfigure = ''
substituteInPlace autostart/CMakeLists.txt \
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
--replace-fail "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
'';
passthru.updateScript = gitUpdater { };

57
pkgs/desktops/lxqt/default.nix
View File

@ -1,4 +1,5 @@
{ pkgs, makeScope, libsForQt5, qt5 }:
{ pkgs, makeScope, kdePackages }:
let
packages = self: with self; {
@ -11,6 +12,7 @@ let
libsysstat = callPackage ./libsysstat {};
liblxqt = callPackage ./liblxqt {};
qtxdg-tools = callPackage ./qtxdg-tools {};
libdbusmenu-lxqt = callPackage ./libdbusmenu-lxqt {};
### CORE 1
libfm-qt = callPackage ./libfm-qt {};
@ -28,7 +30,10 @@ let
lxqt-sudo = callPackage ./lxqt-sudo {};
lxqt-themes = callPackage ./lxqt-themes {};
pavucontrol-qt = callPackage ./pavucontrol-qt {};
qtermwidget = callPackage ./qtermwidget {};
qtermwidget = callPackage ./qtermwidget {
lxqt-build-tools = lxqt-build-tools_0_13;
inherit (pkgs.libsForQt5) qtbase qttools;
};
### CORE 2
lxqt-panel = callPackage ./lxqt-panel {};
@ -36,24 +41,55 @@ let
pcmanfm-qt = callPackage ./pcmanfm-qt {};
### OPTIONAL
qterminal = callPackage ./qterminal {};
compton-conf = callPackage ./compton-conf {};
qterminal = callPackage ./qterminal {
lxqt-build-tools = lxqt-build-tools_0_13;
inherit (pkgs.libsForQt5) qtbase qttools qtx11extras;
};
compton-conf = callPackage ./compton-conf {
lxqt-build-tools = lxqt-build-tools_0_13;
inherit (pkgs.libsForQt5) qtbase qttools qtx11extras;
};
obconf-qt = callPackage ./obconf-qt {};
lximage-qt = callPackage ./lximage-qt {};
qps = callPackage ./qps {};
screengrab = callPackage ./screengrab {};
qlipper = callPackage ./qlipper {};
qlipper = callPackage ./qlipper {
inherit (pkgs.libsForQt5) qtbase qttools;
};
lxqt-archiver = callPackage ./lxqt-archiver {};
xdg-desktop-portal-lxqt = callPackage ./xdg-desktop-portal-lxqt {};
### COMPATIBILITY
lxqt-build-tools_0_13 = callPackage ./lxqt-build-tools {
version = "0.13.0";
inherit (pkgs.libsForQt5) qtbase;
};
libqtxdg_3_12 = callPackage ./libqtxdg {
version = "3.12.0";
lxqt-build-tools = lxqt-build-tools_0_13;
inherit (pkgs.libsForQt5) qtbase qtsvg;
};
libfm-qt_1_4 = callPackage ./libfm-qt {
version = "1.4.0";
lxqt-build-tools = lxqt-build-tools_0_13;
inherit (pkgs.libsForQt5) qttools qtx11extras;
};
lxqt-qtplugin_1_4 = callPackage ./lxqt-qtplugin {
version = "1.4.1";
lxqt-build-tools = lxqt-build-tools_0_13;
libqtxdg = libqtxdg_3_12;
libfm-qt = libfm-qt_1_4;
inherit (pkgs.libsForQt5) qtbase qtsvg qttools libdbusmenu;
};
preRequisitePackages = [
libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
libsForQt5.libkscreen # provides plugins for screen management software
kdePackages.kwindowsystem # provides some QT plugins needed by lxqt-panel
kdePackages.libkscreen # provides plugins for screen management software
pkgs.libfm
pkgs.libfm-extra
pkgs.menu-cache
pkgs.openbox # default window manager
qt5.qtsvg # provides QT5 plugins for svg icons
kdePackages.qtsvg # provides QT plugins for svg icons
];
corePackages = [
@ -62,6 +98,7 @@ let
libsysstat
liblxqt
qtxdg-tools
libdbusmenu-lxqt
### CORE 1
libfm-qt
@ -98,7 +135,7 @@ let
screengrab
### Default icon theme
libsForQt5.breeze-icons
kdePackages.breeze-icons
### Screen saver
pkgs.xscreensaver
@ -106,4 +143,4 @@ let
};
in
makeScope libsForQt5.newScope packages
makeScope kdePackages.newScope packages

40
pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, qtbase
, wrapQtAppsHook
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "libdbusmenu-lxqt";
version = "0.1.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-fwYvU62NCmJ6HNrOqHPWKDas7LE1XF3squ0CBEFkNkk=";
};
nativeBuildInputs = [
cmake
wrapQtAppsHook
];
buildInputs = [
qtbase
];
passthru.updateScript = gitUpdater { };
meta = with lib; {
broken = stdenv.isDarwin;
description = "A Qt implementation of the DBusMenu protocol";
homepage = "https://github.com/lxqt/libdbusmenu-lxqt";
license = licenses.lgpl21Plus;
platforms = with platforms; unix;
maintainers = teams.lxqt.members;
};
}

42
pkgs/desktops/lxqt/libfm-qt/default.nix
View File

@ -1,29 +1,36 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, libXdmcp
, libexif
, libfm
, libpthreadstubs
, libxcb
, lxqt-build-tools
, lxqt-menu-data
, pcre
, libexif
, xorg
, libfm
, menu-cache
, qtx11extras
, pcre
, pkg-config
, qttools
, wrapQtAppsHook
, gitUpdater
, version ? "2.0.0"
, qtx11extras ? null
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "libfm-qt";
version = "1.4.0";
inherit version;
src = fetchFromGitHub {
owner = "lxqt";
repo = "libfm-qt";
rev = version;
hash = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
hash = {
"1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
"2.0.0" = "sha256-vWkuPdG5KaT6KMr1NJGt7JBUd1z3wROKY79otsrRsuI=";
}."${version}";
};
nativeBuildInputs = [
@ -31,19 +38,20 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
lxqt-menu-data
pcre
libXdmcp
libexif
xorg.libpthreadstubs
xorg.libxcb
xorg.libXdmcp
qtx11extras
libfm
libpthreadstubs
libxcb
lxqt-menu-data
menu-cache
];
pcre
] ++ (lib.optionals (lib.versionAtLeast "2.0.0" version) [qtx11extras])
;
passthru.updateScript = gitUpdater { };

34
pkgs/desktops/lxqt/liblxqt/default.nix
View File

@ -1,42 +1,42 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qtx11extras
, qttools
, qtsvg
, libqtxdg
, polkit-qt
, kwindowsystem
, xorg
, gitUpdater
, kwindowsystem
, libXScrnSaver
, libqtxdg
, lxqt-build-tools
, polkit-qt-1
, qtsvg
, qttools
, wrapQtAppsHook
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "liblxqt";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-daD4okYc4J2nRrO6423W0IUK9173zcepCvvMtx7Vho4=";
hash = "sha256-ClAmREsPBb7i7T2aGgf0h3rk1ohUvWQvmSnrlprHzds=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtx11extras
qtsvg
polkit-qt
kwindowsystem
libXScrnSaver
libqtxdg
xorg.libXScrnSaver
polkit-qt-1
qtsvg
];
# convert name of wrapped binary, e.g. .lxqt-whatever-wrapped to the original name, e.g. lxqt-whatever so binaries can find their resources
@ -45,7 +45,7 @@ mkDerivation rec {
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"
--replace-fail "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
'';

14
pkgs/desktops/lxqt/libqtxdg/default.nix
View File

@ -1,27 +1,33 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, qtbase
, qtsvg
, lxqt-build-tools
, wrapQtAppsHook
, gitUpdater
, version ? "4.0.0"
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "libqtxdg";
version = "3.12.0";
inherit version;
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
hash = {
"3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
"4.0.0" = "sha256-TTFgkAI3LulYGuqdhorkjNYyo942y1oFy5SRAKl9ZxU=";
}."${version}";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
wrapQtAppsHook
];
buildInputs = [

9
pkgs/desktops/lxqt/libsysstat/default.nix
View File

@ -1,27 +1,28 @@
{ stdenv
, lib
, mkDerivation
, fetchFromGitHub
, cmake
, qtbase
, lxqt-build-tools
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "libsysstat";
version = "0.4.6";
version = "1.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-dk3I+bkU2ztqIe33rTYneSUd8VFzrElTqVrjHQhAWXw=";
hash = "sha256-2rdhw67TPvy/QmyzbtStgiIuIgZ7ZSt07xjCvOywKF4=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
wrapQtAppsHook
];
buildInputs = [

41
pkgs/desktops/lxqt/lximage-qt/default.nix
View File

@ -1,30 +1,32 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, qtbase
, qttools
, qtx11extras
, qtsvg
, qtimageformats
, xorg
, lxqt-build-tools
, libfm-qt
, libXdmcp
, libexif
, libfm-qt
, libpthreadstubs
, lxqt-build-tools
, menu-cache
, qtbase
, qtimageformats
, qtsvg
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lximage-qt";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-Igfd8lhKDjdseQeARiirj+tEoJdcaeHuyd4mfQHOVg0=";
hash = "sha256-yjsdXVV/EOgpNI5kY12lNH9Wpru8A6eWxayslFdioiQ=";
};
nativeBuildInputs = [
@ -32,18 +34,19 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtbase
qtx11extras
qtsvg
qtimageformats # add-on module to support more image file formats
libfm-qt
xorg.libpthreadstubs
xorg.libXdmcp
libXdmcp
libexif
libfm-qt
libpthreadstubs
menu-cache
qtbase
qtimageformats # add-on module to support more image file formats
qtsvg
qtwayland
];
passthru.updateScript = gitUpdater { };

22
pkgs/desktops/lxqt/lxqt-about/default.nix
View File

@ -1,40 +1,42 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qtx11extras
, qttools
, qtsvg
, kwindowsystem
, liblxqt
, libqtxdg
, lxqt-build-tools
, qtsvg
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-about";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-FA9xvIi45qpD6iGxiiNKNlcLKzJtb0cWmvDBJRnJFwA=";
hash = "sha256-Y0OF4W0quQEet/QvntwGwFqaqJDDUchWYRh+OWZDS8w=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtx11extras
qtsvg
kwindowsystem
liblxqt
libqtxdg
qtsvg
qtwayland
];
passthru.updateScript = gitUpdater { };

28
pkgs/desktops/lxqt/lxqt-admin/default.nix
View File

@ -1,47 +1,49 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qtx11extras
, qttools
, qtsvg
, kwindowsystem
, liblxqt
, libqtxdg
, polkit-qt
, lxqt-build-tools
, polkit-qt-1
, qtsvg
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-admin";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-wPK3TMBC359GnisjpdY2zU+Jnvr7Hdzb6r+HuUQC3mo=";
hash = "sha256-Ps+XiCA6OmnsYj0D+pxpvRxfIZfRGFBbZ0t/IPZjlv8=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtx11extras
qtsvg
kwindowsystem
liblxqt
libqtxdg
polkit-qt
polkit-qt-1
qtsvg
qtwayland
];
postPatch = ''
for f in lxqt-admin-{time,user}/CMakeLists.txt; do
substituteInPlace $f --replace \
substituteInPlace $f --replace-fail \
"\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" \
"$out/share/polkit-1/actions"
done

14
pkgs/desktops/lxqt/lxqt-archiver/default.nix
View File

@ -1,5 +1,5 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
@ -10,19 +10,20 @@
, menu-cache
, qtbase
, qttools
, qtx11extras
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-archiver";
version = "0.9.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = "lxqt-archiver";
rev = version;
hash = "sha256-8pfUpyjn01D8CL+2PjGkZqyHu+lpHZIXlXn67rZoxMY=";
hash = "sha256-32Wq0Faphu0uSG0RdOqrDD/igrNaP6l1mtuV+HcsdcQ=";
};
nativeBuildInputs = [
@ -30,6 +31,7 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
@ -38,7 +40,7 @@ mkDerivation rec {
libfm-qt
menu-cache
qtbase
qtx11extras
qtwayland
];
hardeningDisable = [ "format" ];

24
pkgs/desktops/lxqt/lxqt-build-tools/default.nix
View File

@ -1,5 +1,5 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
@ -7,36 +7,37 @@
, qtbase
, glib
, perl
, wrapQtAppsHook
, gitUpdater
, version ? "2.0.0"
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-build-tools";
version = "0.13.0";
inherit version;
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
hash = {
"0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
"2.0.0" = "sha256-ZFvnIumP03Mp+4OHPe1yMVsSYhMmYUY1idJGCAy5IhA=";
}."${version}";
};
postPatch = ''
# Nix clang on darwin identifies as 'Clang', not 'AppleClang'
# Without this, dependants fail to link.
substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \
--replace AppleClang Clang
# GLib 2.72 moved the file from gio-unix-2.0 to gio-2.0.
# https://github.com/lxqt/lxqt-build-tools/pull/74
substituteInPlace cmake/find-modules/FindGLIB.cmake \
--replace gio/gunixconnection.h gio/gunixfdlist.h
--replace-fail AppleClang Clang
'';
nativeBuildInputs = [
cmake
pkg-config
setupHook
wrapQtAppsHook
];
buildInputs = [
@ -54,8 +55,7 @@ mkDerivation rec {
# We're dependent on this macro doing add_definitions in most places
# But we have the setup-hook to set the values.
postInstall = ''
rm $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake
cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake
cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt${lib.optionalString (lib.versionAtLeast version "2.0.0") "2"}-build-tools/modules/LXQtConfigVars.cmake
'';
passthru.updateScript = gitUpdater { };

55
pkgs/desktops/lxqt/lxqt-config/default.nix
View File

@ -1,33 +1,39 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, glib
, lxqt-build-tools
, lxqt-menu-data
, qtbase
, qtx11extras
, qttools
, qtsvg
, kwindowsystem
, libXScrnSaver
, libXcursor
, libXdmcp
, libkscreen
, liblxqt
, libpthreadstubs
, libqtxdg
, libxcb
, lxqt-build-tools
, lxqt-menu-data
, pkg-config
, qtbase
, qtsvg
, qttools
, qtwayland
, wrapQtAppsHook
, xf86inputlibinput
, xkeyboard_config
, xorg
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-config";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-ypHjUYRtrWx1Cp9KGSqsWpRHg7zoV0YDW6P4amJKapI=";
hash = "sha256-lFZTu6MqqWTjytYC7In/YJ38PYksZXduHvA/FRY4v0U=";
};
nativeBuildInputs = [
@ -35,34 +41,35 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
glib.bin
qtbase
qtx11extras
qtsvg
kwindowsystem
libXScrnSaver
libXcursor
libXdmcp
libkscreen
liblxqt
libpthreadstubs
libqtxdg
libxcb
lxqt-menu-data
xorg.libpthreadstubs
xorg.libXdmcp
xorg.libXScrnSaver
xorg.libxcb
xorg.libXcursor
xorg.xf86inputlibinput
xorg.xf86inputlibinput.dev
qtbase
qtsvg
qtwayland
xf86inputlibinput
xf86inputlibinput.dev
];
postPatch = ''
substituteInPlace lxqt-config-appearance/configothertoolkits.cpp \
--replace 'QStringLiteral("gsettings' \
--replace-fail 'QStringLiteral("gsettings' \
'QStringLiteral("${glib.bin}/bin/gsettings'
substituteInPlace lxqt-config-input/keyboardlayoutconfig.h \
--replace '/usr/share/X11/xkb/rules/base.lst' \
--replace-fail '/usr/share/X11/xkb/rules/base.lst' \
'${xkeyboard_config}/share/X11/xkb/rules/base.lst'
'';

12
pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
View File

@ -1,38 +1,38 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qtbase
, qttools
, qtx11extras
, qtsvg
, kwindowsystem
, liblxqt
, libqtxdg
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-globalkeys";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-2S61d7BSuDPU1dNXLENpmpt6BB+CAeCtBVQS+ZGxrtU=";
hash = "sha256-24alERAnzlU/ZwIlRy9B+58zjRnF9eXunWeEO/lDVxM=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtbase
qtx11extras
qtsvg
kwindowsystem
liblxqt

10
pkgs/desktops/lxqt/lxqt-menu-data/default.nix
View File

@ -1,27 +1,29 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qttools
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-menu-data";
version = "1.4.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-I9jb2e57ZBvND27F5C1zMaoFtij5TetmN9zbJSjxiS4=";
hash = "sha256-CNY23xdFiDQKKJf9GccwDOuBWXwfc7WNI7vMv/zOM9U=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
passthru.updateScript = gitUpdater { };

28
pkgs/desktops/lxqt/lxqt-notificationd/default.nix
View File

@ -1,42 +1,46 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qtbase
, qttools
, qtsvg
, kwindowsystem
, layer-shell-qt
, liblxqt
, libqtxdg
, qtx11extras
, lxqt-build-tools
, qtbase
, qtsvg
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-notificationd";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-Y3+ShGb1DKJw4zv3SCwEq2unJesI1q5OaTlSO8fP76A=";
hash = "sha256-zEoTjDD65bBJBbvAZVtov8HyiN1G6CqYkmcPH4T8Jhc=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtbase
qtsvg
kwindowsystem
layer-shell-qt
liblxqt
libqtxdg
qtx11extras
qtbase
qtsvg
qtwayland
];
passthru.updateScript = gitUpdater { };

26
pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
View File

@ -1,42 +1,44 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qtbase
, qttools
, qtsvg
, qtx11extras
, kwindowsystem
, liblxqt
, libqtxdg
, lxqt-build-tools
, qtbase
, qtsvg
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-openssh-askpass";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-o/hJdaGtjcJiwjqfvfwfcOUv4YdAeeW+rCxsmZZdJQ0=";
hash = "sha256-YDGKp8Fd6lEFSRWGAFUG7SUUFq7gEpJnKlr+ZFsBCRU=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtbase
qtx11extras
qtsvg
kwindowsystem
liblxqt
libqtxdg
qtbase
qtsvg
qtwayland
];
passthru.updateScript = gitUpdater { };

30
pkgs/desktops/lxqt/lxqt-panel/default.nix
View File

@ -1,14 +1,19 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, alsa-lib
, libdbusmenu-lxqt
, kguiaddons
, kwindowsystem
, layer-shell-qt
, libXdamage
, libXdmcp
, libXtst
, libdbusmenu
, liblxqt
, libpthreadstubs
, libpulseaudio
, libqtxdg
, libstatgrab
@ -17,26 +22,26 @@
, lxqt-build-tools
, lxqt-globalkeys
, lxqt-menu-data
, gitUpdater
, menu-cache
, pcre
, qtbase
, qtsvg
, qttools
, qtx11extras
, qtwayland
, solid
, xorg
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-panel";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-LQq1XOA0dGXXORVr2H/gI+axvCAd4P3nB4zCFYWgagc=";
hash = "sha256-2I7I3AiLptKbBXiTPbbpcj16zuIx0e9SQnvbalpoFvM=";
};
nativeBuildInputs = [
@ -44,15 +49,21 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
alsa-lib
libdbusmenu-lxqt
kguiaddons
kwindowsystem
layer-shell-qt
libXdamage
libXdmcp
libXtst
libdbusmenu
liblxqt
libpthreadstubs
libpulseaudio
libqtxdg
libstatgrab
@ -64,11 +75,8 @@ mkDerivation rec {
pcre
qtbase
qtsvg
qtx11extras
qtwayland
solid
xorg.libXdmcp
xorg.libXtst
xorg.libpthreadstubs
];
passthru.updateScript = gitUpdater { };

36
pkgs/desktops/lxqt/lxqt-policykit/default.nix
View File

@ -1,31 +1,32 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, lxqt-build-tools
, qtbase
, qttools
, qtx11extras
, qtsvg
, polkit
, polkit-qt
, kwindowsystem
, liblxqt
, libqtxdg
, lxqt-build-tools
, pcre
, pkg-config
, polkit
, polkit-qt-1
, qtbase
, qtsvg
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-policykit";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-w0o76oBFNy3syQqyFZdAbFUu8yX+uA6cMOHf3WfKPEU=";
hash = "sha256-oYKvQBilpD2RLhN1K6qgRNNAfohCOqmBrKcWy1fXZT8=";
};
nativeBuildInputs = [
@ -33,18 +34,19 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtbase
qtx11extras
qtsvg
polkit
polkit-qt
kwindowsystem
liblxqt
libqtxdg
pcre
polkit
polkit-qt-1
qtbase
qtsvg
qtwayland
];
passthru.updateScript = gitUpdater { };

34
pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
View File

@ -1,48 +1,50 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qtbase
, qttools
, qtx11extras
, qtsvg
, kwindowsystem
, solid
, kidletime
, kwindowsystem
, liblxqt
, libqtxdg
, lxqt-build-tools
, lxqt-globalkeys
, qtbase
, qtsvg
, qttools
, qtwayland
, solid
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-powermanagement";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-1koP+ElW5e85TJqToaErnGkTn3uRHk45bDDrXG6Oy68=";
hash = "sha256-wtqVUXYQWIPhvHj7Ig9qR6sglCRQzcxG192DM3xq/mA=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtbase
qtx11extras
qtsvg
kwindowsystem
solid
kidletime
kwindowsystem
liblxqt
libqtxdg
lxqt-globalkeys
qtbase
qtsvg
qtwayland
solid
];
passthru.updateScript = gitUpdater { };

23
pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
View File

@ -1,8 +1,9 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, libdbusmenu
, libdbusmenu-lxqt
, libdbusmenu ? null
, libfm-qt
, libqtxdg
, lxqt-build-tools
@ -10,38 +11,42 @@
, qtbase
, qtsvg
, qttools
, qtx11extras
, wrapQtAppsHook
, version ? "2.0.0"
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-qtplugin";
version = "1.4.0";
inherit version;
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-0shNkM1AGAjzMQDGLOIP2DFx6goJGoD0U0Gr+rRRFrk=";
hash = {
"1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc=";
"2.0.0" = "sha256-o5iD4VzsbN81lwDZJuFj8Ugg1RP752M4unu3J5/h8g8=";
}."${version}";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
libdbusmenu
(if lib.versionAtLeast version "2.0.0" then libdbusmenu-lxqt else libdbusmenu)
libfm-qt
libqtxdg
qtbase
qtsvg
qtx11extras
];
postPatch = ''
substituteInPlace src/CMakeLists.txt \
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
--replace-fail "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
'';
passthru.updateScript = gitUpdater { };

30
pkgs/desktops/lxqt/lxqt-runner/default.nix
View File

@ -1,32 +1,34 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, lxqt-build-tools
, qtbase
, qttools
, qtsvg
, kwindowsystem
, layer-shell-qt
, liblxqt
, libqtxdg
, lxqt-build-tools
, lxqt-globalkeys
, qtx11extras
, menu-cache
, muparser
, pcre
, pkg-config
, qtbase
, qtsvg
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-runner";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-NGytLQ2D5t1UdMGZoeHxHaXPwbRFDx+11ocjImXqZBU=";
hash = "sha256-r9rz6rJX60+1/+Wd5APobyZRioXzD1xveFIMToTvpXQ=";
};
nativeBuildInputs = [
@ -34,19 +36,21 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtbase
qtsvg
qtx11extras
kwindowsystem
layer-shell-qt
liblxqt
libqtxdg
lxqt-globalkeys
menu-cache
muparser
pcre
qtbase
qtsvg
qtwayland
];
passthru.updateScript = gitUpdater { };

43
pkgs/desktops/lxqt/lxqt-session/default.nix
View File

@ -1,32 +1,35 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, lxqt-build-tools
, qtbase
, qttools
, qtsvg
, qtx11extras
, kwindowsystem
, layer-shell-qt
, libXdmcp
, liblxqt
, libpthreadstubs
, libqtxdg
, qtxdg-tools
, lxqt-build-tools
, pkg-config
, procps
, xorg
, qtbase
, qtsvg
, qttools
, qtwayland
, qtxdg-tools
, wrapQtAppsHook
, xdg-user-dirs
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-session";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-kVDPJPYBwK7aXCIWGClwfM9J3067U8lPVWt0jFfqooY=";
hash = "sha256-IgpGtIVTcSs0O3jEniIuyIAyKBSkwN/jpGL6yZg3AVo=";
};
nativeBuildInputs = [
@ -34,19 +37,21 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
kwindowsystem
layer-shell-qt
libXdmcp
liblxqt
libpthreadstubs
libqtxdg
procps
qtbase
qtsvg
qtx11extras
kwindowsystem
liblxqt
libqtxdg
qtwayland
qtxdg-tools
procps
xorg.libpthreadstubs
xorg.libXdmcp
xdg-user-dirs
];

26
pkgs/desktops/lxqt/lxqt-sudo/default.nix
View File

@ -1,43 +1,45 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qtbase
, qttools
, qtx11extras
, qtsvg
, kwindowsystem
, liblxqt
, libqtxdg
, lxqt-build-tools
, qtbase
, qtsvg
, qttools
, qtwayland
, sudo
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-sudo";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-J7jiap3qZD+P0kGzt+b3wa16pxbS2fr3OmalhV5O9ro=";
hash = "sha256-kDcOHqHuAyHTQ7ccsCelPOBieXdRLloEvSMjq9PIa30=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtbase
qtx11extras
qtsvg
kwindowsystem
liblxqt
libqtxdg
qtbase
qtsvg
qtwayland
sudo
];

8
pkgs/desktops/lxqt/lxqt-themes/default.nix
View File

@ -1,20 +1,20 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "lxqt-themes";
version = "1.3.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ=";
hash = "sha256-bAdwC1YrXCT4eJUafTK6kcfQ/YnMbBLHyyWvsBLIisA=";
};
nativeBuildInputs = [

39
pkgs/desktops/lxqt/obconf-qt/default.nix
View File

@ -1,19 +1,23 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, pcre
, qtbase
, qttools
, qtx11extras
, xorg
, libSM
, libXdmcp
, libpthreadstubs
, lxqt-build-tools
, openbox
, pcre
, pkg-config
, qtbase
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "obconf-qt";
version = "0.16.4";
@ -29,16 +33,25 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
libSM
libXdmcp
libpthreadstubs
openbox
pcre
qtbase
qtx11extras
xorg.libpthreadstubs
xorg.libXdmcp
xorg.libSM
openbox
qtwayland
];
patches = [
(fetchpatch {
name = "obconf-qt.port-to-qt6";
url = "https://patch-diff.githubusercontent.com/raw/lxqt/obconf-qt/pull/230.patch";
hash = "sha256-XLt8+/4oMXeli07qTAGc73U9RD1fGYqxTX0QdhuXpII=";
})
];
passthru.updateScript = gitUpdater { };

18
pkgs/desktops/lxqt/pavucontrol-qt/default.nix
View File

@ -1,24 +1,26 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, lxqt-build-tools
, libpulseaudio
, lxqt-build-tools
, pkg-config
, qtbase
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "pavucontrol-qt";
version = "1.4.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-eNhoqY1pak96x0xCypvgHmgCYjw4CYH8ABtWjIZrD3w=";
hash = "sha256-dhFVVqJIX40oiHCcnG1166RsllXtfaO7MqM6ZNizjQQ=";
};
nativeBuildInputs = [
@ -26,11 +28,13 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtbase
libpulseaudio
qtbase
qtwayland
];
passthru.updateScript = gitUpdater { };

34
pkgs/desktops/lxqt/pcmanfm-qt/default.nix
View File

@ -1,29 +1,31 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, layer-shell-qt
, libexif
, libfm-qt
, lxqt-build-tools
, lxqt-menu-data
, qtbase
, qttools
, qtx11extras
, qtimageformats
, libfm-qt
, menu-cache
, pkg-config
, qtbase
, qtimageformats
, qttools
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "pcmanfm-qt";
version = "1.4.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-Z3OivGlUZQVoeMWn8ZBvhajH5hrvVMIsjGKcrx5FkEE=";
hash = "sha256-PyCtcn+QHwX/iy85A3y7Phf8ogdSRrwtXrJYGxrjyLM=";
};
nativeBuildInputs = [
@ -31,22 +33,24 @@ mkDerivation rec {
pkg-config
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
layer-shell-qt
libexif
lxqt-menu-data
qtbase
qtx11extras
qtimageformats # add-on module to support more image file formats
libfm-qt
lxqt-menu-data
menu-cache
qtbase
qtimageformats # add-on module to support more image file formats
qtwayland
];
passthru.updateScript = gitUpdater { };
postPatch = ''
substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt
substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace-fail @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt
'';
meta = with lib; {

6
pkgs/desktops/lxqt/qlipper/default.nix
View File

@ -1,13 +1,14 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, qtbase
, qttools
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "qlipper";
version = "5.1.2";
@ -21,6 +22,7 @@ mkDerivation rec {
nativeBuildInputs = [
cmake
qttools
wrapQtAppsHook
];
buildInputs = [

18
pkgs/desktops/lxqt/qps/default.nix
View File

@ -1,32 +1,35 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, kwindowsystem
, liblxqt
, libqtxdg
, lxqt-build-tools
, gitUpdater
, qtbase
, qtsvg
, qttools
, qtx11extras
, qtwayland
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "qps";
version = "2.8.0";
version = "2.9.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-Xr+61t6LzoXASHuXrE5ro3eWGxMSDCVnck49dCtiaww=";
hash = "sha256-Jit1CdFZyhKOjNytTBH9T4NqqmhxoifXGgPUyVdzJ+4=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
@ -34,7 +37,8 @@ mkDerivation rec {
liblxqt
libqtxdg
qtbase
qtx11extras
qtsvg
qtwayland
];
passthru.updateScript = gitUpdater { };

10
pkgs/desktops/lxqt/qterminal/default.nix
View File

@ -1,17 +1,18 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qtermwidget
, qtbase
, qtermwidget
, qttools
, qtx11extras
, wrapQtAppsHook
, gitUpdater
, nixosTests
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "qterminal";
version = "1.4.0";
@ -26,12 +27,13 @@ mkDerivation rec {
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [
qtbase
qtx11extras
qtermwidget
qtx11extras
];
passthru.updateScript = gitUpdater { };

5
pkgs/desktops/lxqt/qtermwidget/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv
, lib
, mkDerivation
, fetchFromGitHub
, cmake
, qtbase
, qttools
, lxqt-build-tools
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "qtermwidget";
version = "1.4.0";
@ -24,6 +24,7 @@ mkDerivation rec {
cmake
lxqt-build-tools
qttools
wrapQtAppsHook
];
buildInputs = [

16
pkgs/desktops/lxqt/qtxdg-tools/default.nix
View File

@ -1,32 +1,36 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, qtbase
, libqtxdg
, lxqt-build-tools
, qtbase
, qtsvg
, wrapQtAppsHook
, gitUpdater
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "qtxdg-tools";
version = "3.12.0";
version = "4.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-3i5SVhEMHar09xoSfVCxJtPXeR81orcNR7pSIJImipQ=";
hash = "sha256-w9pFHG+q2oT33Lfg88MUzfWSyvHUgC0Fi2V8XcueJ/Q=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
wrapQtAppsHook
];
buildInputs = [
qtbase
libqtxdg
qtbase
qtsvg
];
passthru.updateScript = gitUpdater { };

37
pkgs/desktops/lxqt/screengrab/default.nix
View File

@ -1,29 +1,30 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, qtbase
, qttools
, qtx11extras
, qtsvg
, kwindowsystem
, libqtxdg
, perl
, xorg
, autoPatchelfHook
, gitUpdater
, kwindowsystem
, libXdmcp
, libpthreadstubs
, libqtxdg
, perl
, pkg-config
, qtbase
, qtsvg
, qttools
, wrapQtAppsHook
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "screengrab";
version = "2.7.0";
version = "2.8.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-mmN3BQum7X0GWTUYauEN2mAo3GWdmtkIl2i84g5cp78=";
hash = "sha256-PMe2NyIoc12n4l/oWPi3GL6pemuHyxL2HFBLTIyD690=";
};
nativeBuildInputs = [
@ -32,16 +33,16 @@ mkDerivation rec {
perl # needed by LXQtTranslateDesktop.cmake
qttools
autoPatchelfHook # fix libuploader.so and libextedit.so not found
wrapQtAppsHook
];
buildInputs = [
qtbase
qtx11extras
qtsvg
kwindowsystem
libXdmcp
libpthreadstubs
libqtxdg
xorg.libpthreadstubs
xorg.libXdmcp
qtbase
qtsvg
];
passthru.updateScript = gitUpdater { };

14
pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
View File

@ -1,5 +1,5 @@
{ lib
, mkDerivation
, stdenv
, fetchFromGitHub
, cmake
, kwindowsystem
@ -7,24 +7,26 @@
, libfm-qt
, lxqt-qtplugin
, menu-cache
, qtx11extras
, qtbase
, wrapQtAppsHook
, gitUpdater
, extraQtStyles ? []
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-lxqt";
version = "0.5.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
hash = "sha256-6yfLjDK8g8cpeeyuFUEjERTLLn6h3meKjD2Eb7Cj9qY=";
hash = "sha256-JSbFZ7R1Cu5VPPb50fRVSAsaE0LE15BbbHpvJZP6+w0=";
};
nativeBuildInputs = [
cmake
wrapQtAppsHook
];
buildInputs = [
@ -33,7 +35,7 @@ mkDerivation rec {
libfm-qt
lxqt-qtplugin
menu-cache
qtx11extras
qtbase
]
++ extraQtStyles;

2
pkgs/top-level/all-packages.nix
View File

@ -37928,7 +37928,7 @@ with pkgs;
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
inherit pkgs;
inherit (lib) makeScope;
inherit qt5 libsForQt5;
inherit kdePackages;
});
mate = recurseIntoAttrs (callPackage ../desktops/mate { });