Merge pull request #194939 from wegank/rehex-0.5.3
rehex: 0.4.1 -> 0.5.3
This commit is contained in:
commit
a515c0caa1
|
@ -3,41 +3,37 @@
|
|||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, which
|
||||
, zip
|
||||
, libicns
|
||||
, capstone
|
||||
, jansson
|
||||
, libunistring
|
||||
, lua5_3
|
||||
, wxGTK31
|
||||
, lua53Packages
|
||||
, perlPackages
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, IOKit
|
||||
, libicns
|
||||
, wxmac
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rehex";
|
||||
version = "0.4.1";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solemnwarning";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-NuWWaYABQDaS9wkwmXkBJWHzLFJbUUCiePNQNo4yZrk=";
|
||||
hash = "sha256-VBHNrOVIz7UM9tY1V7Ykwt4Cv0fY++8gXc2og4sLDk8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# See https://github.com/solemnwarning/rehex/pull/148
|
||||
substituteInPlace Makefile.osx \
|
||||
--replace '$(filter-out %@2x.png,$(wildcard $(ICONSET)/*.png))' 'res/icon{16,32,128,256,512}.png'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config which ]
|
||||
nativeBuildInputs = [ pkg-config which zip ]
|
||||
++ lib.optionals stdenv.isDarwin [ libicns ];
|
||||
|
||||
buildInputs = [ capstone jansson libunistring lua5_3 ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ wxGTK31 ]
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
|
||||
buildInputs = [ capstone jansson libunistring wxGTK31 ]
|
||||
++ (with lua53Packages; [ lua busted ])
|
||||
++ (with perlPackages; [ perl TemplateToolkit ])
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ];
|
||||
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ];
|
||||
|
@ -53,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/solemnwarning/rehex";
|
||||
changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ markus1189 ];
|
||||
maintainers = with maintainers; [ markus1189 wegank ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10489,8 +10489,8 @@ with pkgs;
|
|||
|
||||
remarshal = with python3Packages; toPythonApplication remarshal;
|
||||
|
||||
rehex = callPackage ../applications/editors/rehex {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit;
|
||||
rehex = darwin.apple_sdk_11_0.callPackage ../applications/editors/rehex {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit;
|
||||
};
|
||||
|
||||
rig = callPackage ../tools/misc/rig { };
|
||||
|
|
Loading…
Reference in a new issue