cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

rehex: 0.3.1 -> 0.3.91 (#135437)

Browse source 
* rehex: 0.3.1 -> 0.3.91

* Apply suggestions from code review
This commit is contained in:
Sandro 2021-08-24 15:32:28 +02:00 committed by GitHub
parent 823ff946b8
commit 5e34e5eacd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/applications/editors/rehex/default.nix
View file

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

4
pkgs/top-level/all-packages.nix
View file

@ -8339,7 +8339,9 @@ with pkgs;
remarshal = callPackage ../development/tools/remarshal { };
rehex = callPackage ../applications/editors/rehex { };
rehex = callPackage ../applications/editors/rehex {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit;
};
rig = callPackage ../tools/misc/rig {
stdenv = gccStdenv;