diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/applications/misc/joplin-desktop | |
parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/joplin-desktop')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index c4b4fdfd42e6..4219851fc9d3 100644 --- a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,13 +1,19 @@ -{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, makeDesktopItem }: let pname = "joplin-desktop"; - version = "1.0.177"; + version = "1.0.179"; + desktopItem = makeDesktopItem { + name = "Joplin"; + exec = "joplin-desktop"; + type = "Application"; + desktopName = "Joplin"; + }; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "023q3yxqsv0vd76bvfhyhh0pnfia01rflfpyv0i6w6xnb5hm2jp7"; + sha256 = "0v7d5wzwiznl755pl6jfg33g6jxr1cbm9j13jpbmfi497hj8w82k"; }; @@ -18,7 +24,12 @@ in appimageTools.wrapType2 rec { multiPkgs = null; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + extraInstallCommands = '' + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications + mv $out/bin/{${name},${pname}} + ''; + meta = with lib; { description = "An open source note taking and to-do application with synchronisation capabilities"; |