From e7bf1e3ec443d255a722fbc0451163d3564ec8b6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 12 Nov 2023 21:18:46 +0100 Subject: [PATCH 1/3] libsForQt5.qmltermwidget: Adopt --- pkgs/development/libraries/qmltermwidget/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index a18df6a4a7869..7f096c8858aca 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { homepage = "https://github.com/Swordfish90/qmltermwidget"; license = lib.licenses.gpl2; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ OPNA2608 ]; }; } From 427d085756583df00689c2188c715c8479739e1a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 12 Nov 2023 21:21:40 +0100 Subject: [PATCH 2/3] libsForQt5.qmltermwidget: Minor cleanups - Clarify license - Replace INSTALL_ROOT with proper $$PREFIX usage - Minor style stuff --- .../libraries/qmltermwidget/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 7f096c8858aca..b84460b4df1b3 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,9 +1,9 @@ { lib , stdenv , fetchFromGitHub +, qmake , qtbase , qtquick1 -, qmake , qtmultimedia , utmp }: @@ -13,13 +13,15 @@ stdenv.mkDerivation { version = "unstable-2022-01-09"; src = fetchFromGitHub { - repo = "qmltermwidget"; owner = "Swordfish90"; + repo = "qmltermwidget"; rev = "63228027e1f97c24abb907550b22ee91836929c5"; hash = "sha256-aVaiRpkYvuyomdkQYAgjIfi6a3wG2a6hNH1CfkA2WKQ="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + ]; buildInputs = [ qtbase @@ -34,17 +36,15 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace qmltermwidget.pro \ - --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" + --replace '$$[QT_INSTALL_QML]' '$$PREFIX/${qtbase.qtQmlPrefix}/' ''; - installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ]; - dontWrapQtApps = true; meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordfish90/qmltermwidget"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ OPNA2608 ]; }; From cd28d787492db857bca08f80ef105a7fc2721be9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 12 Nov 2023 21:27:43 +0100 Subject: [PATCH 3/3] libsForQt5.qmltermwidget: Apply Lomiri patches So we can use it for lomiri-terminal-app --- pkgs/development/libraries/qmltermwidget/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index b84460b4df1b3..a8aec285a98e5 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , qmake , qtbase , qtquick1 @@ -30,6 +31,15 @@ stdenv.mkDerivation { ] ++ lib.optional stdenv.isDarwin utmp; patches = [ + # Changes required to make it compatible with lomiri-terminal-app + # QML-exposed colorscheme, scrollbar & clipboard functionality + # Remove when https://github.com/Swordfish90/qmltermwidget/pull/39 merged + (fetchpatch { + name = "0001-qmltermwidget-lomiri-submissions.patch"; + url = "https://github.com/Swordfish90/qmltermwidget/compare/63228027e1f97c24abb907550b22ee91836929c5..ffc6b2b2a20ca785f93300eca93c25c4b74ece17.patch"; + hash = "sha256-1GjC2mdfP3NpePDWZaT8zvIq3vwWIZs+iQ9o01iQtD4="; + }) + # Some files are copied twice to the output which makes the build fails ./do-not-copy-artifacts-twice.patch ];