From 07540daf4d5b189c913c58a024afaa3eca8dfb2d Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Sat, 21 Nov 2020 18:35:28 +0100 Subject: [PATCH 1/2] rehex: init at 0.3.1 --- pkgs/applications/editors/rehex/default.nix | 39 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/editors/rehex/default.nix diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix new file mode 100644 index 00000000000..2f7083965af --- /dev/null +++ b/pkgs/applications/editors/rehex/default.nix @@ -0,0 +1,39 @@ +{ capstone +, fetchFromGitHub +, jansson +, lib +, stdenv +, wxGTK30 +}: + +stdenv.mkDerivation rec { + pname = "rehex"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "solemnwarning"; + repo = pname; + rev = version; + sha256 = "1yj9a63j7534mmz8cl1ifg2wmgkxmk6z75jd8lkmc2sfrjbick32"; + }; + + buildInputs = [ + capstone + jansson + wxGTK30 + ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "Reverse Engineers' Hex Editor"; + longDescription = '' + A cross-platform (Windows, Linux, Mac) hex editor for reverse + engineering, and everything else. + ''; + homepage = "https://github.com/solemnwarning/rehex"; + license = licenses.gpl2; + maintainers = with maintainers; [ markus1189 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fa36d3fa40..83832b54728 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6672,6 +6672,8 @@ in remarshal = callPackage ../development/tools/remarshal { }; + rehex = callPackage ../applications/editors/rehex { }; + rig = callPackage ../tools/misc/rig { stdenv = gccStdenv; }; From cdb23e9abda8ff0dbf3ff3d85a9a370ddf8a3504 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Sun, 22 Nov 2020 09:13:00 +0100 Subject: [PATCH 2/2] Add darwin support from @SuperSandro2000 --- pkgs/applications/editors/rehex/default.nix | 29 +++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 2f7083965af..0fe00d08405 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -1,9 +1,11 @@ -{ capstone +{ stdenv , fetchFromGitHub +, capstone , jansson -, lib -, stdenv , wxGTK30 +, darwin +, libicns +, wxmac }: stdenv.mkDerivation rec { @@ -17,15 +19,20 @@ stdenv.mkDerivation rec { sha256 = "1yj9a63j7534mmz8cl1ifg2wmgkxmk6z75jd8lkmc2sfrjbick32"; }; - buildInputs = [ - capstone - jansson - wxGTK30 - ]; + patchPhase = '' + substituteInPlace Makefile.osx --replace 'iconutil -c icns -o $@ $(ICONSET)' \ + 'png2icns $@ $(ICONSET)/icon_16x16.png $(ICONSET)/icon_32x32.png $(ICONSET)/icon_128x128.png $(ICONSET)/icon_256x256.png $(ICONSET)/icon_512x512.png' + ''; - makeFlags = [ "prefix=$(out)" ]; + nativeBuildInputs = stdenv.lib.optionals (stdenv.isDarwin) [ libicns ]; - meta = with lib; { + buildInputs = [ capstone jansson ] + ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ wxGTK30 ]) + ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit wxmac ])); + + makeFlags = [ "prefix=$(out)" ] ++ (stdenv.lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]); + + meta = with stdenv.lib; { description = "Reverse Engineers' Hex Editor"; longDescription = '' A cross-platform (Windows, Linux, Mac) hex editor for reverse @@ -33,7 +40,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/solemnwarning/rehex"; license = licenses.gpl2; - maintainers = with maintainers; [ markus1189 ]; + maintainers = with maintainers; [ markus1189 SuperSandro2000 ]; platforms = platforms.all; }; }