Merge pull request #220054 from Scrumplex/init-qt6ct

qt6ct: init at 0.8
This commit is contained in:
José Romildo Malaquias 2023-06-06 09:40:27 -03:00 committed by GitHub
commit 4607765abc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 1 deletions

View File

@ -20,7 +20,7 @@ let
pkgs.adwaita-qt6
]
else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
else if isQt5ct then [ pkgs.libsForQt5.qt5ct ]
else if isQt5ct then [ pkgs.libsForQt5.qt5ct pkgs.qt6Packages.qt6ct ]
else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ]
else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ]
else throw "`qt.platformTheme` ${cfg.platformTheme} and `qt.style` ${cfg.style} are not compatible.";

View File

@ -0,0 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
, qtbase
, qtsvg
, qtwayland
, qmake
, qttools
, wrapQtAppsHook
}:
let
inherit (lib) getDev;
in
stdenv.mkDerivation rec {
pname = "qt6ct";
version = "0.8";
src = fetchFromGitHub {
owner = "trialuser02";
repo = "qt6ct";
rev = version;
sha256 = "BFE5aUgn3uFJWTgd4sUwP2L9RZwwwr5jVtAapA9vYbA=";
};
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
buildInputs = [ qtbase qtsvg qtwayland ];
qmakeFlags = [
"LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease"
"PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
"LIBDIR=${placeholder "out"}/lib"
];
meta = with lib; {
description = "Qt6 Configuration Tool";
homepage = "https://github.com/trialuser02/qt6ct";
platforms = platforms.linux;
license = licenses.bsd2;
maintainers = with maintainers; [ Flakebi Scrumplex ];
};
}

View File

@ -1417,6 +1417,7 @@ mapAliases ({
qt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24
qt515 = qt5; # Added 2022-11-24
qt5ct = libsForQt5.qt5ct; # Added 2021-12-27
qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
qtcurve = libsForQt5.qtcurve; # Added 2020-11-07
qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04

View File

@ -31,6 +31,8 @@ in
inherit (kdeFrameworks) kcoreaddons;
qt6ct = callPackage ../tools/misc/qt6ct { };
qtkeychain = callPackage ../development/libraries/qtkeychain {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security;
};