diff options
| author | Eric Wolf <ericwolf42@gmail.com> | 2018-08-15 08:00:55 +0200 |
|---|---|---|
| committer | Eric Wolf <ericwolf42@gmail.com> | 2018-08-15 08:00:55 +0200 |
| commit | b2cf9529d641ddd4a3e7dc210f87d68b4653dfd2 (patch) | |
| tree | 355cc3d06db1be18cd479cf0f025e7b575f13a36 /pkgs/applications/misc/ptask | |
| parent | 44a4370b1f3aa2b1b2416d8c09b8df6900f5c449 (diff) | |
ptask: remove usage of nonexistent function is_error
see https://github.com/json-c/json-c/issues/304
Diffstat (limited to 'pkgs/applications/misc/ptask')
| -rw-r--r-- | pkgs/applications/misc/ptask/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/ptask/json_c_is_error.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index e1a64c73a1236..6cbc90806caaf 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -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" \ diff --git a/pkgs/applications/misc/ptask/json_c_is_error.patch b/pkgs/applications/misc/ptask/json_c_is_error.patch new file mode 100644 index 0000000000000..435c8b26e6f7e --- /dev/null +++ b/pkgs/applications/misc/ptask/json_c_is_error.patch @@ -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; |