From 03f7e0ee26c4dd69587458d6fcdd81dfafa25f52 Mon Sep 17 00:00:00 2001
From: Sandro Jäckel <sandro.jaeckel@gmail.com>
Date: Mon, 24 Jun 2024 14:39:46 +0200
Subject: ktailctl: 0.16.0 -> 0.16.1

---
 pkgs/applications/networking/ktailctl/default.nix  | 24 +++++++++++++++-------
 .../ktailctl/install-missing-libraries.diff        |  9 ++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/networking/ktailctl/install-missing-libraries.diff

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix
index 88caf1a5f43e3..0536fa2fdea61 100644
--- a/pkgs/applications/networking/ktailctl/default.nix
+++ b/pkgs/applications/networking/ktailctl/default.nix
@@ -10,6 +10,7 @@
 , qtbase
 , qtdeclarative
 , qtsvg
+, qtwayland
 , kconfig
 , kcoreaddons
 , kguiaddons
@@ -18,31 +19,37 @@
 , kirigami-addons
 , knotifications
 , nlohmann_json
+, qqc2-desktop-style
 }:
 
 let
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "f-koehler";
     repo = "KTailctl";
     rev = "v${version}";
-    hash = "sha256-fIx6XfNGK+jDpeaoCzTKwv3J01yWoHOgWxjbwTGVK1U=";
+    hash = "sha256-rMvFwWTrYWZUAMWd6H/SXE26q5ASjwsa8bD1tFC6yBI=";
   };
 
   goDeps = (buildGoModule {
-    pname = "tailwrap";
+    pname = "ktailctl-go-wrapper";
     inherit src version;
-    modRoot = "tailwrap";
-    vendorHash = "sha256-egTzSdOKrhdEBKarIfROxZUsxbnR9F1JDbdoKzGf9UM=";
+    modRoot = "src/wrapper";
+    vendorHash = "sha256-GD+G+7b8GBwR3OrRPJbGJVom+kLC67VvlGFIA0S7UF8=";
   }).goModules;
 in
 stdenv.mkDerivation {
   pname = "ktailctl";
   inherit version src;
 
+  patches = [
+    # Install libktailctl_config.so https://github.com/f-koehler/KTailctl/pull/212
+    ./install-missing-libraries.diff
+  ];
+
   postPatch = ''
-    cp -r --reflink=auto ${goDeps} tailwrap/vendor
+    cp -r --reflink=auto ${goDeps} src/wrapper/vendor
   '';
 
   # needed for go build to work
@@ -67,13 +74,16 @@ stdenv.mkDerivation {
     qtbase
     qtdeclarative
     qtsvg
+    qtwayland
     kconfig
     kcoreaddons
     kguiaddons
     ki18n
     kirigami
+    kirigami-addons
     knotifications
     nlohmann_json
+    qqc2-desktop-style
   ];
 
   meta = with lib; {
@@ -82,6 +92,6 @@ stdenv.mkDerivation {
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ k900 ];
     mainProgram = "ktailctl";
-    platforms = platforms.all;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/ktailctl/install-missing-libraries.diff b/pkgs/applications/networking/ktailctl/install-missing-libraries.diff
new file mode 100644
index 0000000000000..6153199a66638
--- /dev/null
+++ b/pkgs/applications/networking/ktailctl/install-missing-libraries.diff
@@ -0,0 +1,9 @@
+diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
+index ed0a64a..970e509 100644
+--- a/src/config/CMakeLists.txt
++++ b/src/config/CMakeLists.txt
+@@ -7,3 +7,4 @@ target_link_libraries(ktailctl_config
+     KF6::ConfigGui
+     ktailctl_wrapper
+ )
++install(TARGETS ktailctl_config)
-- 
cgit 1.4.1