Merge master into staging-next
This commit is contained in:
@@ -13,23 +13,18 @@
|
||||
, file
|
||||
, libzip
|
||||
, xxHash
|
||||
, gtk2 ? null
|
||||
, vte ? null
|
||||
, gtkdialog ? null
|
||||
, python3 ? null
|
||||
, ruby ? null
|
||||
, lua ? null
|
||||
, gtk2
|
||||
, vte
|
||||
, gtkdialog
|
||||
, python3
|
||||
, ruby
|
||||
, lua
|
||||
, useX11 ? false
|
||||
, rubyBindings ? false
|
||||
, pythonBindings ? false
|
||||
, luaBindings ? false
|
||||
}:
|
||||
|
||||
assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
|
||||
assert rubyBindings -> ruby != null;
|
||||
assert pythonBindings -> python3 != null;
|
||||
|
||||
|
||||
let
|
||||
inherit (lib) optional;
|
||||
|
||||
|
||||
@@ -35,8 +35,6 @@ mkDerivation rec {
|
||||
qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH")
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free and Open Source Reverse Engineering Platform powered by rizin";
|
||||
homepage = src.meta.homepage;
|
||||
|
||||
@@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
|
||||
"-Duse_sys_tree_sitter=true"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja cmake ];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.8.9";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-K8lNo2XmHzgbaVCMNvwDwr86hrXBPws9v3HD8ku+D6w=";
|
||||
sha256 = "sha256-ZjXAZN93ij42WVYSOgvKAzFZ/cZ2RTFKT2sr44j7TVc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-spTy9vzldzqu66904wRVwAeH1rNOQ3WeC6miJkRiAGg=";
|
||||
cargoSha256 = "sha256-eQv9pFegHTjjjFURiD/yN/srtONAwAH3vwfrSY/LM/Q=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user