ktailctl: 0.16.0 -> 0.16.1

This commit is contained in:
Sandro Jäckel
2024-06-24 14:42:42 +02:00
parent 3247a65980
commit 03f7e0ee26
2 changed files with 26 additions and 7 deletions
@@ -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;
};
}
@@ -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)