pyrox.dev
wxhexeditor: fix compilation
+3
-4
pkgs/applications/editors/wxhexeditor/default.nix
+3
-4
pkgs/applications/editors/wxhexeditor/default.nix
···
1
1
{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:
2
2
3
3
stdenv.mkDerivation rec {
4
-
name = "wxHexEditor-${version}";
4
+
pname = "wxHexEditor";
5
5
version = "0.24";
6
6
7
7
src = fetchFromGitHub {
···
26
26
url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch;
27
27
sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj";
28
28
})
29
+
./missing-semicolon.patch
29
30
];
30
31
31
-
buildPhase = ''
32
-
make OPTFLAGS="-fopenmp"
33
-
'';
32
+
makeFlags = [ "OPTFLAGS=-fopenmp" ];
34
33
35
34
meta = {
36
35
description = "Hex Editor / Disk Editor for Huge Files or Devices";
+35
pkgs/applications/editors/wxhexeditor/missing-semicolon.patch
+35
pkgs/applications/editors/wxhexeditor/missing-semicolon.patch
···
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
+
-