Skip to content

Commit 3f9dc98

Browse files
authored
qt6ct: use new upstream and use CMake (#387423)
2 parents d71c856 + 1c4ac8f commit 3f9dc98

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

pkgs/tools/misc/qt6ct/default.nix

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
{
2+
cmake,
3+
fetchFromGitLab,
24
lib,
3-
stdenv,
4-
fetchFromGitHub,
55
qtbase,
66
qtsvg,
7-
qtwayland,
8-
qmake,
97
qttools,
8+
qtwayland,
9+
stdenv,
1010
wrapQtAppsHook,
1111
}:
1212

1313
stdenv.mkDerivation (finalAttrs: {
1414
pname = "qt6ct";
1515
version = "0.10";
1616

17-
src = fetchFromGitHub {
18-
owner = "ilya-fedin";
17+
src = fetchFromGitLab {
18+
domain = "www.opencode.net";
19+
owner = "trialuser";
1920
repo = "qt6ct";
2021
tag = finalAttrs.version;
21-
hash = "sha256-ePY+BEpEcAq11+pUMjQ4XG358x3bXFQWwI1UAi+KmLo=";
22+
hash = "sha256-o2k/b4AGiblS1CkNInqNrlpM1Y7pydIJzEVgVd3ao50=";
2223
};
2324

2425
nativeBuildInputs = [
25-
qmake
26+
cmake
2627
qttools
2728
wrapQtAppsHook
2829
];
@@ -33,15 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
3334
qtwayland
3435
];
3536

36-
qmakeFlags = [
37-
"LRELEASE_EXECUTABLE=${lib.getDev qttools}/bin/lrelease"
38-
"PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
39-
"LIBDIR=${placeholder "out"}/lib"
40-
];
37+
postPatch = ''
38+
substituteInPlace src/qt6ct-qtplugin/CMakeLists.txt src/qt6ct-style/CMakeLists.txt \
39+
--replace-fail "\''${PLUGINDIR}" "$out/${qtbase.qtPluginPrefix}"
40+
'';
4141

4242
meta = {
4343
description = "Qt6 Configuration Tool";
44-
homepage = "https://github.com/ilya-fedin/qt6ct";
44+
homepage = "https://www.opencode.net/trialuser/qt6ct";
4545
platforms = lib.platforms.linux;
4646
license = lib.licenses.bsd2;
4747
maintainers = with lib.maintainers; [

0 commit comments

Comments
 (0)