diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index b8b46c977184..abf133146e64 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -42,7 +42,7 @@ let platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; - linux = appimageTools.wrapType2 rec { + linux = appimageTools.wrapType2 { inherit pname version src meta; nativeBuildInputs = [ makeWrapper ]; @@ -51,13 +51,12 @@ let ''; extraInstallCommands = '' - wrapProgram $out/bin/${pname} \ + wrapProgram $out/bin/joplin-desktop \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps - substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' \ - --replace 'Icon=joplin' "Icon=@joplinapp-desktop" + install -Dm644 ${appimageContents}/@joplinapp-desktop.desktop $out/share/applications/joplin.desktop + install -Dm644 ${appimageContents}/@joplinapp-desktop.png $out/share/pixmaps/joplin.png + substituteInPlace $out/share/applications/joplin.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=joplin-desktop' ''; };