summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-11-21 09:36:00 -0500
committerGitHub <noreply@github.com>2023-11-21 09:36:00 -0500
commita3a15d720ccc51def8c5835098369bb9a762b1d5 (patch)
tree786711dc6251451b343012c95b4f614be8712a9c
parent638ff1bf7ce920dae019023332ff3b7cab7f540f (diff)
parent0fd6535b4c6b528dc5062fc5fac139f66e629d64 (diff)
Merge pull request #268870 from ShamrockLee/clamtk-icon
clamtk: wrap with wrapGAppsHook
-rw-r--r--pkgs/by-name/cl/clamtk/package.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/by-name/cl/clamtk/package.nix b/pkgs/by-name/cl/clamtk/package.nix
index 5abe53ddb8c09..c0a62923d224a 100644
--- a/pkgs/by-name/cl/clamtk/package.nix
+++ b/pkgs/by-name/cl/clamtk/package.nix
@@ -1,7 +1,7 @@
 { lib
 , perlPackages
 , fetchFromGitHub
-, makeWrapper
+, wrapGAppsHook
 , gobject-introspection
 , perl
 , clamav
@@ -18,7 +18,7 @@ perlPackages.buildPerlPackage rec {
     hash = "sha256-o6OaXOXLykTUuF/taKnEhZRV04/3nlU5aNY05ANr1Ko=";
   };
 
-  nativeBuildInputs = [ makeWrapper gobject-introspection ];
+  nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
   buildInputs = [ perl clamav ];
   propagatedBuildInputs = with perlPackages; [ Glib LWP LWPProtocolHttps TextCSV JSON LocaleGettext Gtk3 ];
 
@@ -51,11 +51,17 @@ perlPackages.buildPerlPackage rec {
     install -D images/* -t $out/share/pixmaps
     install -D clamtk.1.gz -t $out/share/man/man1
     install -D -m755 clamtk -t $out/bin
-    wrapProgram $out/bin/clamtk --prefix PERL5LIB : $PERL5LIB --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH"
 
     runHook postInstall
   '';
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PERL5LIB : $PERL5LIB
+      --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH"
+    )
+  '';
+
   meta = with lib; {
     description = ''
       Easy to use, lightweight front-end for ClamAV (Clam Antivirus).
@@ -63,7 +69,7 @@ perlPackages.buildPerlPackage rec {
     license = licenses.gpl1Plus;
     homepage = "https://github.com/dave-theunsub/clamtk";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ jgarcia ];
+    maintainers = with maintainers; [ jgarcia ShamrockLee ];
   };
 
 }