From c0c9af0824d2efc1771214a9586885068ed05a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 28 Jan 2023 16:33:11 +0100 Subject: [PATCH 1/2] jnetmap: 0.5.4 -> 0.5.5 This fixes a startup crash: $ jnetmap Exception in thread "main" java.lang.NoClassDefFoundError: edu/uci/ics/jung/graph/MultiGraph ... (exit code 1) --- pkgs/applications/networking/jnetmap/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index 2a686fdd8b9e..3da5ff4bd284 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "jnetmap"; - version = "0.5.4"; + version = "0.5.5"; + versionSuffix = "-703"; src = fetchurl { - url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}.jar"; - sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl"; + url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}${versionSuffix}.jar"; + sha256 = "sha256-e4Ssm2Sq/v1YZ7ZudAqgQ7Cz2ffwWbSmLFoKhaZvTPg="; }; nativeBuildInputs = [ makeWrapper ]; From 79ff8344968c2cef237a829378c146083d105895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 28 Jan 2023 18:56:10 +0100 Subject: [PATCH 2/2] jnetmap: add missing runHook in installPhase --- pkgs/applications/networking/jnetmap/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index 3da5ff4bd284..8aea49decb7e 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -16,12 +16,16 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" mkdir -p "$out/lib" cp "${src}" "$out/lib/jnetmap.jar" makeWrapper "${jre}/bin/java" "$out/bin/jnetmap" \ --add-flags "-jar \"$out/lib/jnetmap.jar\"" + + runHook postInstall ''; meta = with lib; {