Merge pull request #305107 from romildo/upd.lxqt (f0c15cd7) · Commits · nix / nixpkgs

nixos/modules/services/x11/desktop-managers/lxqt.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -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" ];

pkgs/desktops/deepin/apps/deepin-terminal/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
		qttools
		pkg-config
		wrapQtAppsHook
		lxqt.lxqt-build-tools
		lxqt.lxqt-build-tools_0_13
		];

		buildInputs = [

pkgs/desktops/deepin/library/qt5integration/default.nix

+1 −1

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

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

+12 −9

Original line number	Diff line number	Diff line
		{ 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 { };

pkgs/desktops/lxqt/default.nix

+47 −10

Original line number	Diff line number	Diff line
		{ 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