diff options
author | marius851000 <mariusdavid@laposte.net> | 2019-09-03 10:09:25 +0200 |
---|---|---|
committer | marius851000 <mariusdavid@laposte.net> | 2019-09-03 10:09:25 +0200 |
commit | c4514dfbb78c212fc6b3bbe68e2564c0833c59f3 (patch) | |
tree | 19cc6797b28f28ffbd3cb76b9e5f76b6e3ca3b2d /pkgs | |
parent | e4506992255676b4911570f473f432cc79742515 (diff) |
wxhexeditor: fix compilation
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/wxhexeditor/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/editors/wxhexeditor/missing-semicolon.patch | 35 |
2 files changed, 38 insertions, 4 deletions
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index c345e8a95d55b..4725d8143b479 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: stdenv.mkDerivation rec { - name = "wxHexEditor-${version}"; + pname = "wxHexEditor"; version = "0.24"; src = fetchFromGitHub { @@ -26,11 +26,10 @@ stdenv.mkDerivation rec { url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch; sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj"; }) + ./missing-semicolon.patch ]; - buildPhase = '' - make OPTFLAGS="-fopenmp" - ''; + makeFlags = [ "OPTFLAGS=-fopenmp" ]; meta = { description = "Hex Editor / Disk Editor for Huge Files or Devices"; diff --git a/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch b/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch new file mode 100644 index 0000000000000..75722c9c7c55c --- /dev/null +++ b/pkgs/applications/editors/wxhexeditor/missing-semicolon.patch @@ -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(); + } +- |