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,51 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext }:
stdenv.mkDerivation rec {
pname = "wxHexEditor";
version = "0.24";
src = fetchFromGitHub {
repo = "wxHexEditor";
owner = "EUA";
rev = "v${version}";
sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ wxGTK libtool python2 gettext ];
preConfigure = "patchShebangs .";
prePatch = ''
substituteInPlace Makefile --replace "/usr" "$out"
substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out"
'';
patches = [
# https://github.com/EUA/wxHexEditor/issues/90
(fetchpatch {
url = "https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch";
sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj";
})
./missing-semicolon.patch
];
makeFlags = [ "OPTFLAGS=-fopenmp" ];
meta = {
description = "Hex Editor / Disk Editor for Huge Files or Devices";
longDescription = ''
This is not an ordinary hex editor, but could work as low level disk editor too.
If you have problems with your HDD or partition, you can recover your data from HDD or
from partition via editing sectors in raw hex.
You can edit your partition tables or you could recover files from File System by hand
with help of wxHexEditor.
Or you might want to analyze your big binary files, partitions, devices... If you need
a good reverse engineer tool like a good hex editor, you welcome.
wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes.
'';
homepage = "http://www.wxhexeditor.org/";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}

View file

@ -0,0 +1,35 @@
diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp
index 091a6f9..12e6a78 100644
--- a/src/HexDialogs.cpp
+++ b/src/HexDialogs.cpp
@@ -420,7 +420,7 @@ void FindDialog::OnChar( wxKeyEvent& event ){
}
void FindDialog::EventHandler( wxCommandEvent& event ){
- WX_CLEAR_ARRAY(parent->HighlightArray )
+ WX_CLEAR_ARRAY(parent->HighlightArray );
parent->HighlightArray.Shrink();
if( event.GetId() == btnFind->GetId())
diff --git a/src/HexEditorCtrl/HexEditorCtrl.cpp b/src/HexEditorCtrl/HexEditorCtrl.cpp
index 7a3b0e2..f12097f 100644
--- a/src/HexEditorCtrl/HexEditorCtrl.cpp
+++ b/src/HexEditorCtrl/HexEditorCtrl.cpp
@@ -64,9 +64,9 @@ HexEditorCtrl::~HexEditorCtrl( void ){
Dynamic_Disconnector();
Clear();
- WX_CLEAR_ARRAY(MainTagArray)
- WX_CLEAR_ARRAY(HighlightArray)
- WX_CLEAR_ARRAY(CompareArray)
+ WX_CLEAR_ARRAY(MainTagArray);
+ WX_CLEAR_ARRAY(HighlightArray);
+ WX_CLEAR_ARRAY(CompareArray);
MainTagArray.Shrink();
HighlightArray.Shrink();
@@ -1224,4 +1224,3 @@ void wxHugeScrollBar::OnOffsetScroll( wxScrollEvent& event ){
#endif
event.Skip();
}
-