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

Merge pull request #45051 from typetetris/45049 

ptask: remove usage of nonexistent function is_error
This commit is contained in:
xeji 2018-08-15 12:41:31 +02:00 committed by GitHub
parent ad71d9b0d5 ff9a38ee89
commit 8238101f67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/misc/ptask/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig makeWrapper ]; nativeBuildInputs = [ pkgconfig makeWrapper ];
patches = [ ./tw-version.patch ]; patches = [ ./tw-version.patch ./json_c_is_error.patch ];
preFixup = '' preFixup = ''
wrapProgram "$out/bin/ptask" \ wrapProgram "$out/bin/ptask" \
@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
description = "GTK-based GUI for taskwarrior"; description = "GTK-based GUI for taskwarrior";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.spacefrogg ]; maintainers = [ maintainers.spacefrogg ];
platforms = platforms.linux;
}; };
} }

13
pkgs/applications/misc/ptask/json_c_is_error.patch Normal file
View 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;