public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghidra: 9.1 -> 9.1.2

Browse Source 
Move icoutils from buildInputs to nativeBuildInputs because it is a
compile time dependency.
This commit is contained in:
Nils André-Chang 2020-04-10 19:14:45 +01:00
parent 0e27a1f2b4
commit ec88246d1a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/security/ghidra/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, lib, makeWrapper, autoPatchelfHook { stdenv, fetchzip, lib, makeWrapper, autoPatchelfHook
, openjdk11, pam, makeDesktopItem, icoutils , openjdk11, pam, makeDesktopItem, icoutils
}: let }: let
@ -16,23 +16,22 @@
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "ghidra-9.1"; name = "ghidra-9.1.2";
src = fetchurl { src = fetchzip {
url = "https://ghidra-sre.org/ghidra_9.1_PUBLIC_20191023.zip"; url = "https://ghidra-sre.org/ghidra_9.1.2_PUBLIC_20200212.zip";
sha256 = "0pl7s59008gvgwz4mxp7rz3xr3vaa12a6s5zvx2yr9jxx3gk1l99"; sha256 = "0j48pijypg44bw06azbrgfqjkigb13ljfdxib70sxwyqia3vkbbm";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
autoPatchelfHook autoPatchelfHook
unzip icoutils
]; ];
buildInputs = [ buildInputs = [
stdenv.cc.cc.lib stdenv.cc.cc.lib
pam pam
icoutils
]; ];
dontStrip = true; dontStrip = true;
@ -42,7 +41,7 @@ in stdenv.mkDerivation {
mkdir -p "${pkg_path}" "$out/share/applications" mkdir -p "${pkg_path}" "$out/share/applications"
cp -a * "${pkg_path}" cp -a * "${pkg_path}"
ln -s ${desktopItem}/share/applications/* $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications
icotool -x "${pkg_path}/support/ghidra.ico" icotool -x "${pkg_path}/support/ghidra.ico"
rm ghidra_4_40x40x32.png rm ghidra_4_40x40x32.png
for f in ghidra_*.png; do for f in ghidra_*.png; do