uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,31 @@
{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }:
stdenv.mkDerivation rec {
pname = "ptask";
version = "1.0.0";
src = fetchurl {
url = "https://wpitchoune.net/ptask/files/ptask-${version}.tar.gz";
sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq";
};
buildInputs = [ gtk3 json_c ];
nativeBuildInputs = [ pkg-config makeWrapper ];
patches = [ ./tw-version.patch ./json_c_is_error.patch ];
preFixup = ''
wrapProgram "$out/bin/ptask" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--prefix PATH : "${taskwarrior}/bin"
'';
meta = with lib; {
homepage = "http://wpitchoune.net/ptask/";
description = "GTK-based GUI for taskwarrior";
license = licenses.gpl2;
maintainers = [ maintainers.spacefrogg ];
platforms = platforms.linux;
};
}

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;

View file

@ -0,0 +1,11 @@
--- a/src/tw.c 2017-02-21 22:56:19.289037608 +0100
+++ b/src/tw.c 2017-02-21 22:57:04.726814256 +0100
@@ -116,7 +116,7 @@
|| !strcmp(ver, "2.3.0")
|| !strcmp(ver, "2.4.0")
|| !strcmp(ver, "2.4.1")
- || !strcmp(ver, "2.5.0"))
+ || !strcmp(ver, "2.5.1"))
return 1;
else
return 0;