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,36 @@
{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkg-config } :
stdenv.mkDerivation rec {
pname = "gosmore";
version = "31801";
# the gosmore svn repository does not lock revision numbers of its externals
# so we explicitly disable them to avoid breaking the hash
# especially as the externals appear to be unused
src = fetchsvn {
url = "http://svn.openstreetmap.org/applications/rendering/gosmore";
sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi";
rev = version;
ignoreExternals = true;
};
buildInputs = [ libxml2 gtk2 curl ];
nativeBuildInputs = [ pkg-config ];
prePatch = ''
sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
'';
patches = [ ./pointer_int_comparison.patch ];
patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol
meta = with lib; {
description = "Open Street Map viewer";
homepage = "https://sourceforge.net/projects/gosmore/";
maintainers = with maintainers; [
raskin
];
platforms = platforms.linux;
license = licenses.bsd2;
};
}

View file

@ -0,0 +1,11 @@
--- blah_/jni/gosmore.cpp 1970-01-01 01:00:01.000000000 +0100
+++ /dev/stdin 2018-03-18 00:21:08.474217132 +0100
@@ -1273,7 +1273,7 @@
if (deg[i] < -180 || deg[i] > 180) break;
if (i == 0 && (strncasecmp (t, "lat", 3) == 0 ||
strncasecmp (t, "lon", 3) == 0)) { // lat=-25.7 lon=28.2
- for (t += 3; t != '\0' && !isalnum (*t); t++) {}
+ for (t += 3; *t != '\0' && !isalnum (*t); t++) {}
}
if (i == 1) { // Success !
//printf ("%lf %lf %u\n", deg[lonFirst ? 1 : 0], deg[lonFirst ? 0 : 1],