From 1f4d5433a9e70f7b5748b6fba38cc583fad622ae Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 6 Apr 2019 12:26:09 -0500 Subject: [PATCH 1/2] joplin-desktop: 1.0.140 -> 1.0.142 https://discourse.joplin.cozic.net/t/joplin-version-1-0-142/2024 --- pkgs/applications/misc/joplin-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index aa49f0e3d75..c893f38469e 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,8 +1,8 @@ { stdenv, appimage-run, fetchurl }: let - version = "1.0.140"; - sha256 = "1114v141jayqhvkkxf7dr864j09nf5nz002c7z0pprzr00fifqzx"; + version = "1.0.142"; + sha256 = "0k7lnv3qqz17a2a2d431sic3ggi3373r5k0kwxm4017ama7d72m1"; in stdenv.mkDerivation rec { name = "joplin-${version}"; From 09462ddd0624d911b2e8f7fe8036085e890b13c0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 7 Apr 2019 00:58:27 -0500 Subject: [PATCH 2/2] joplin-desktop: wrap to avoid crashing due to lack of schemas --- pkgs/applications/misc/joplin-desktop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index c893f38469e..bf2de7271ab 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appimage-run, fetchurl }: +{ stdenv, appimage-run, fetchurl, gsettings-desktop-schemas, gtk3, gobject-introspection, wrapGAppsHook }: let version = "1.0.142"; @@ -12,7 +12,8 @@ in inherit sha256; }; - buildInputs = [ appimage-run ]; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ appimage-run gtk3 gsettings-desktop-schemas gobject-introspection ]; unpackPhase = ":";