Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6b9c0adc2405
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d902a826377
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 10, 2020

  1. ghidra: 9.1 -> 9.1.2 

    Move icoutils from buildInputs to nativeBuildInputs because it is a
compile time dependency.
    @NilsIrl
    NilsIrl committed Apr 10, 2020
    Copy the full SHA
    ec88246 View commit details

Commits on Apr 18, 2020

  1. Merge pull request #84925 from NilsIrl/ghidra_9.1.2 

    ghidra: 9.1 -> 9.1.2
    @bhipple
    bhipple authored Apr 18, 2020
    Copy the full SHA
    3d902a8 View commit details
Showing with 7 additions and 8 deletions.
  1. +7 −8 pkgs/tools/security/ghidra/default.nix
15 changes: 7 additions & 8 deletions pkgs/tools/security/ghidra/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, lib, makeWrapper, autoPatchelfHook
{ stdenv, fetchzip, lib, makeWrapper, autoPatchelfHook
, openjdk11, pam, makeDesktopItem, icoutils
}: let

@@ -16,23 +16,22 @@

in stdenv.mkDerivation {

name = "ghidra-9.1";
name = "ghidra-9.1.2";

src = fetchurl {
url = "https://ghidra-sre.org/ghidra_9.1_PUBLIC_20191023.zip";
sha256 = "0pl7s59008gvgwz4mxp7rz3xr3vaa12a6s5zvx2yr9jxx3gk1l99";
src = fetchzip {
url = "https://ghidra-sre.org/ghidra_9.1.2_PUBLIC_20200212.zip";
sha256 = "0j48pijypg44bw06azbrgfqjkigb13ljfdxib70sxwyqia3vkbbm";
};

nativeBuildInputs = [
makeWrapper
autoPatchelfHook
unzip
icoutils
];

buildInputs = [
stdenv.cc.cc.lib
pam
icoutils
];

dontStrip = true;
@@ -42,7 +41,7 @@ in stdenv.mkDerivation {
mkdir -p "${pkg_path}" "$out/share/applications"
cp -a * "${pkg_path}"
ln -s ${desktopItem}/share/applications/* $out/share/applications
icotool -x "${pkg_path}/support/ghidra.ico"
rm ghidra_4_40x40x32.png
for f in ghidra_*.png; do