Merge pull request #45051 from typetetris/45049
ptask: remove usage of nonexistent function is_error
This commit is contained in:
commit
8238101f67
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
||||
patches = [ ./tw-version.patch ];
|
||||
patches = [ ./tw-version.patch ./json_c_is_error.patch ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/ptask" \
|
||||
@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
|
||||
description = "GTK-based GUI for taskwarrior";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.spacefrogg ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
13
pkgs/applications/misc/ptask/json_c_is_error.patch
Normal file
13
pkgs/applications/misc/ptask/json_c_is_error.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/src/tw.c b/src/tw.c
|
||||
index 602f7b3..ca601cd 100644
|
||||
--- a/src/tw.c
|
||||
+++ b/src/tw.c
|
||||
@@ -163,7 +163,7 @@ static struct json_object *task_exec_json(const char *opts)
|
||||
|
||||
free(cmd);
|
||||
|
||||
- if (o && is_error(o))
|
||||
+ if (!o)
|
||||
return NULL;
|
||||
|
||||
return o;
|
Loading…
Reference in New Issue
Block a user