diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-08-24 15:32:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 15:32:28 +0200 |
| commit | 5e34e5eacd15b97bd84a2810543a31cb12b5777f (patch) | |
| tree | 7e942dca43d7429b4c4a4f9cd974ff5ce22cefed /pkgs/applications/editors/rehex | |
| parent | 823ff946b85508ffc6ad70cc0984abc741def879 (diff) | |
| download | nixpkgs-5e34e5eacd15b97bd84a2810543a31cb12b5777f.tar nixpkgs-5e34e5eacd15b97bd84a2810543a31cb12b5777f.tar.gz nixpkgs-5e34e5eacd15b97bd84a2810543a31cb12b5777f.tar.bz2 nixpkgs-5e34e5eacd15b97bd84a2810543a31cb12b5777f.tar.lz nixpkgs-5e34e5eacd15b97bd84a2810543a31cb12b5777f.tar.xz nixpkgs-5e34e5eacd15b97bd84a2810543a31cb12b5777f.tar.zst nixpkgs-5e34e5eacd15b97bd84a2810543a31cb12b5777f.zip | |
rehex: 0.3.1 -> 0.3.91 (#135437)
* rehex: 0.3.1 -> 0.3.91 * Apply suggestions from code review
Diffstat (limited to 'pkgs/applications/editors/rehex')
| -rw-r--r-- | pkgs/applications/editors/rehex/default.nix | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index df5fed210e6..baf8b93d7fe 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -1,36 +1,43 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, pkg-config , capstone , jansson -, wxGTK30 -, darwin +, lua5_3 +, wxGTK31 +, Carbon +, Cocoa +, IOKit , libicns , wxmac }: stdenv.mkDerivation rec { pname = "rehex"; - version = "0.3.1"; + version = "0.3.91"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - sha256 = "1yj9a63j7534mmz8cl1ifg2wmgkxmk6z75jd8lkmc2sfrjbick32"; + sha256 = "sha256-lemak/sGff346IOzOnMB4L4TkDRA/1L3KV3VNdWxIFA="; }; - patchPhase = '' + postPatch = '' 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' ''; - nativeBuildInputs = lib.optionals (stdenv.isDarwin) [ libicns ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals stdenv.isDarwin [ libicns ]; - buildInputs = [ capstone jansson ] - ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK30 ]) - ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit wxmac ])); + buildInputs = [ capstone jansson lua5_3 ] + ++ lib.optionals (!stdenv.isDarwin) [ wxGTK31 ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ]; - makeFlags = [ "prefix=$(out)" ] ++ (lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]); + makeFlags = [ "prefix=$(out)" ] + ++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]; meta = with lib; { description = "Reverse Engineers' Hex Editor"; |