MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #67992 from marius851000/wxhexeditor2

Browse source 
wxhexeditor: fix compilation
This commit is contained in:
Marek Mahut 2019-09-03 11:04:49 +02:00 committed by GitHub
commit bf276a6aba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/editors/wxhexeditor/default.nix
View file

@ -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";

35
pkgs/applications/editors/wxhexeditor/missing-semicolon.patch Normal file
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();
}
-