git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67992 from marius851000/wxhexeditor2

wxhexeditor: fix compilation

commitbf276a6aba36f6be014acda0a42b5b20b61b52f8 authorMarek Mahut <marek.mahut@gmail.com> dateTue 3 Sep 2019, 11:04 (7 years ago) parent38f7debc4514df
2 files changed+37−3
pkgs/applications/editors/wxhexeditor/default.nix+2−3 pkgs/applications/editors/wxhexeditor/missing-semicolon.patch+35
pkgs/applications/editors/wxhexeditor/default.nix+2−3
@@ -26,11 +26,10 @@ stdenv.mkDerivation rec {
2626 url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch;
2727 sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj";
2828 })
29+ ./missing-semicolon.patch
2930 ];
3031
31− buildPhase = ''
32− make OPTFLAGS="-fopenmp"
33− '';
32+ makeFlags = [ "OPTFLAGS=-fopenmp" ];
3433
3534 meta = {
3635 description = "Hex Editor / Disk Editor for Huge Files or Devices";
pkgs/applications/editors/wxhexeditor/missing-semicolon.patchnew file+35
@@ -0,0 +1,35 @@
1+diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp
2+index 091a6f9..12e6a78 100644
3+--- a/src/HexDialogs.cpp
4++++ b/src/HexDialogs.cpp
5+@@ -420,7 +420,7 @@ void FindDialog::OnChar( wxKeyEvent& event ){
6+ }
7+
8+ void FindDialog::EventHandler( wxCommandEvent& event ){
9+- WX_CLEAR_ARRAY(parent->HighlightArray )
10++ WX_CLEAR_ARRAY(parent->HighlightArray );
11+ parent->HighlightArray.Shrink();
12+
13+ if( event.GetId() == btnFind->GetId())
14+diff --git a/src/HexEditorCtrl/HexEditorCtrl.cpp b/src/HexEditorCtrl/HexEditorCtrl.cpp
15+index 7a3b0e2..f12097f 100644
16+--- a/src/HexEditorCtrl/HexEditorCtrl.cpp
17++++ b/src/HexEditorCtrl/HexEditorCtrl.cpp
18+@@ -64,9 +64,9 @@ HexEditorCtrl::~HexEditorCtrl( void ){
19+ Dynamic_Disconnector();
20+ Clear();
21+
22+- WX_CLEAR_ARRAY(MainTagArray)
23+- WX_CLEAR_ARRAY(HighlightArray)
24+- WX_CLEAR_ARRAY(CompareArray)
25++ WX_CLEAR_ARRAY(MainTagArray);
26++ WX_CLEAR_ARRAY(HighlightArray);
27++ WX_CLEAR_ARRAY(CompareArray);
28+
29+ MainTagArray.Shrink();
30+ HighlightArray.Shrink();
31+@@ -1224,4 +1224,3 @@ void wxHugeScrollBar::OnOffsetScroll( wxScrollEvent& event ){
32+ #endif
33+ event.Skip();
34+ }
35+-