From 6aea2ab7fa9a9ce59154c9f86a68e737e9c9d328 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 20 Aug 2019 00:42:55 -0500 Subject: [PATCH] khal: patch using upstream commit adding khal.desktop --- pkgs/applications/misc/khal/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 06ad4e00b1fe..6aa94b2fecb8 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, python3 }: +{ stdenv, pkgs, python3, fetchpatch }: with python3.pkgs; buildPythonApplication rec { pname = "khal"; @@ -9,6 +9,14 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"; }; + # Include a khal.desktop file via upstream commit. + # This patch should be removed when updating to the next version, probably. + patches = [ (fetchpatch { + name = "add-khal-dot-desktop.patch"; + url = "https://github.com/pimutils/khal/commit/1f93d238fec7c934dd2f8e48f54925d22130e3aa.patch"; + sha256 = "06skn3van7zd93348fc6axllx71ckkc7h2zljqlvwa339vca608c"; + }) ]; + propagatedBuildInputs = [ atomicwrites click