From f67f8eef13f19072316bcf545f8f5dcb7574c04c Mon Sep 17 00:00:00 2001 From: Jonas Date: Mon, 9 Dec 2024 14:17:16 +0100 Subject: [PATCH] fiji: add wrapGAppsHook --- pkgs/by-name/fi/fiji/package.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fiji/package.nix b/pkgs/by-name/fi/fiji/package.nix index 18a2ebb15d21d..d63899330b739 100644 --- a/pkgs/by-name/fi/fiji/package.nix +++ b/pkgs/by-name/fi/fiji/package.nix @@ -8,6 +8,7 @@ , copyDesktopItems , runtimeShell , unzip +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -21,7 +22,14 @@ stdenv.mkDerivation rec { dontBuild = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems unzip ]; + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook3 + makeWrapper + copyDesktopItems + unzip + ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; desktopItems = [ @@ -40,6 +48,8 @@ stdenv.mkDerivation rec { }) ]; + dontWrapGApps = true; + installPhase = '' runHook preInstall @@ -58,7 +68,8 @@ stdenv.mkDerivation rec { makeWrapper $out/bin/.fiji-launcher-hack $out/bin/fiji \ --prefix PATH : ${lib.makeBinPath [ jdk11 ]} \ - --set JAVA_HOME ${jdk11.home} + --set JAVA_HOME ${jdk11.home} \ + ''${gappsWrapperArgs[@]} ln $out/fiji/images/icon.png $out/share/pixmaps/fiji.png