From 1c4ac8fe1ff4a37d8c9966dd9d02bec0b9eae1be Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 5 Mar 2025 23:06:44 +0100 Subject: [PATCH] qt6ct: use CMake Signed-off-by: Sefa Eyeoglu --- pkgs/tools/misc/qt6ct/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/qt6ct/default.nix b/pkgs/tools/misc/qt6ct/default.nix index 0d025a2d8e27..5fb7301afd4e 100644 --- a/pkgs/tools/misc/qt6ct/default.nix +++ b/pkgs/tools/misc/qt6ct/default.nix @@ -1,12 +1,12 @@ { - lib, - stdenv, + cmake, fetchFromGitLab, + lib, qtbase, qtsvg, - qtwayland, - qmake, qttools, + qtwayland, + stdenv, wrapQtAppsHook, }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - qmake + cmake qttools wrapQtAppsHook ]; @@ -34,11 +34,10 @@ stdenv.mkDerivation (finalAttrs: { qtwayland ]; - qmakeFlags = [ - "LRELEASE_EXECUTABLE=${lib.getDev qttools}/bin/lrelease" - "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" - "LIBDIR=${placeholder "out"}/lib" - ]; + postPatch = '' + substituteInPlace src/qt6ct-qtplugin/CMakeLists.txt src/qt6ct-style/CMakeLists.txt \ + --replace-fail "\''${PLUGINDIR}" "$out/${qtbase.qtPluginPrefix}" + ''; meta = { description = "Qt6 Configuration Tool";