public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #98584 from sikmir/joplin

Browse Source 
joplin-desktop: 1.0.245 -> 1.1.4
This commit is contained in:
Silvan Mosberger 2020-09-30 23:47:53 +02:00 committed by GitHub
commit 098dedb63f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
pkgs/applications/misc/joplin-desktop/default.nix
View File

@ -1,39 +1,31 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, makeDesktopItem }: { stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }:
let let
pname = "joplin-desktop"; pname = "joplin-desktop";
version = "1.0.245"; version = "1.1.4";
name = "${pname}-${version}"; name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
suffix = {
x86_64-linux = "AppImage";
x86_64-darwin = "dmg";
}.${system} or throwSystem;
src = fetchurl { src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
sha256 = "1xybzjixqmp95b2a97kbbygn0jwndws9115cd7mbw8czl7nshdq6"; sha256 = {
x86_64-linux = "1jgmjwjl2y3nrywnwidpk6p31sypy3gjghmzzqkrgjpf77ccbssm";
x86_64-darwin = "1v06k4qrk3n1ncgpmnqp4axmn7gvs3mgbvf8n6ldhgjhj3hq9day";
}.${system} or throwSystem;
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {
inherit name src; inherit name src;
}; };
in appimageTools.wrapType2 rec {
inherit name src;
profile = '' meta = with stdenv.lib; {
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = ''
mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/joplin.desktop $out/share/applications/joplin.desktop
install -m 444 -D ${appimageContents}/joplin.png \
$out/share/pixmaps/joplin.png
substituteInPlace $out/share/applications/joplin.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
meta = with lib; {
description = "An open source note taking and to-do application with synchronisation capabilities"; description = "An open source note taking and to-do application with synchronisation capabilities";
longDescription = '' longDescription = ''
Joplin is a free, open source note taking and to-do application, which can Joplin is a free, open source note taking and to-do application, which can
@ -45,6 +37,41 @@ in appimageTools.wrapType2 rec {
homepage = "https://joplinapp.org"; homepage = "https://joplinapp.org";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ hugoreeves ]; maintainers = with maintainers; [ hugoreeves ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" "x86_64-darwin" ];
}; };
}
linux = appimageTools.wrapType2 rec {
inherit name src meta;
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = ''
mv $out/bin/{${name},${pname}}
install -Dm444 ${appimageContents}/joplin.desktop -t $out/share/applications
install -Dm444 ${appimageContents}/joplin.png -t $out/share/pixmaps
substituteInPlace $out/share/applications/joplin.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
};
darwin = stdenv.mkDerivation {
inherit name src meta;
nativeBuildInputs = [ undmg ];
sourceRoot = "Joplin.app";
installPhase = ''
mkdir -p $out/Applications/Joplin.app
cp -R . $out/Applications/Joplin.app
'';
};
in
if stdenv.isDarwin
then darwin
else linux