From 2df9231001a8ca6b530dfd6f638a96aaf8dede76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 12 Jun 2024 07:21:34 -0300 Subject: [PATCH 1/3] kdePackages.qt6gtk2: use default install phase --- pkgs/tools/misc/qt6gtk2/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/qt6gtk2/default.nix b/pkgs/tools/misc/qt6gtk2/default.nix index 69044a2bb312..d3a1697a0429 100644 --- a/pkgs/tools/misc/qt6gtk2/default.nix +++ b/pkgs/tools/misc/qt6gtk2/default.nix @@ -16,15 +16,9 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/qt-6/plugins/{platformthemes,styles} - cp -pr src/qt6gtk2-qtplugin/libqt6gtk2.so $out/lib/qt-6/plugins/platformthemes - cp -pr src/qt6gtk2-style/libqt6gtk2-style.so $out/lib/qt-6/plugins/styles - - runHook postInstall - ''; + qmakeFlags = [ + "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" + ]; meta = { description = "GTK+2.0 integration plugins for Qt6"; From 639edea59fde14186fe911e5be29e34dd9e22978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 12 Jun 2024 07:25:51 -0300 Subject: [PATCH 2/3] kdePackages.qt6gtk2: 0.2 -> 0.2-unstable-2024-05-06 Diff: https://github.com/trialuser02/qt6gtk2/compare/0.2...d29ba6c1fb4ac933ed7b91f0480cbd0c5a975ab8 --- pkgs/tools/misc/qt6gtk2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/qt6gtk2/default.nix b/pkgs/tools/misc/qt6gtk2/default.nix index d3a1697a0429..59091d121c60 100644 --- a/pkgs/tools/misc/qt6gtk2/default.nix +++ b/pkgs/tools/misc/qt6gtk2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qt6gtk2"; - version = "0.2"; + version = "0.2-unstable-2024-05-06"; src = fetchFromGitHub { owner = "trialuser02"; repo = finalAttrs.pname; - rev = finalAttrs.version; - hash = "sha256-g5ZCwTnNEJJ57zEwNqMxrl0EWYJMt3PquZ2IsmxQYqk="; + rev = "d29ba6c1fb4ac933ed7b91f0480cbd0c5a975ab8"; + hash = "sha256-lIUCdfsmvuzDQaOi2U/CHch1re6Jn6yDfcX26Gu0eUo="; }; buildInputs = [ gtk2 qtbase ]; From ddbdab1d07c70eff17779c9e5664b2cefb244fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 12 Jun 2024 07:03:06 -0300 Subject: [PATCH 3/3] kdePackages.qt6gtk2: add update script --- pkgs/tools/misc/qt6gtk2/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/qt6gtk2/default.nix b/pkgs/tools/misc/qt6gtk2/default.nix index 59091d121c60..28a3e6e53589 100644 --- a/pkgs/tools/misc/qt6gtk2/default.nix +++ b/pkgs/tools/misc/qt6gtk2/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, gtk2, pkg-config, qmake, qtbase }: +{ fetchFromGitHub, lib, stdenv, gtk2, pkg-config, qmake, qtbase, unstableGitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "qt6gtk2"; @@ -20,6 +20,8 @@ stdenv.mkDerivation (finalAttrs: { "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" ]; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "GTK+2.0 integration plugins for Qt6"; license = lib.licenses.gpl2Plus;