Skip to content

Commit

Permalink
fiji: add wrapGAppsHook (NixOS#363577)
Browse files Browse the repository at this point in the history
  • Loading branch information
Aleksanaa authored Dec 10, 2024
2 parents 2bd2fb9 + f67f8ee commit 31bfd9c
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions pkgs/by-name/fi/fiji/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
, copyDesktopItems
, runtimeShell
, unzip
, wrapGAppsHook3
}:

stdenv.mkDerivation rec {
Expand All @@ -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 = [
Expand All @@ -40,6 +48,8 @@ stdenv.mkDerivation rec {
})
];

dontWrapGApps = true;

installPhase = ''
runHook preInstall
Expand All @@ -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
Expand Down

0 comments on commit 31bfd9c

Please sign in to comment.