From d374996cac2ab3a8a1222cba3b07647c7bcff394 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 25 Mar 2024 18:53:53 +0100 Subject: [PATCH] freemind: adopt, refactor and make deterministic --- pkgs/applications/misc/freemind/default.nix | 83 ++++++++++++++------- 1 file changed, 58 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index 0bdf8df306a8..5e5d205c8ae9 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -1,43 +1,76 @@ -{ lib, stdenv, fetchurl, jdk, jre, ant }: +{ + lib, + stdenv, + fetchurl, + ant, + jdk, + jre, + makeWrapper, + stripJavaArchivesHook, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freemind"; version = "1.0.1"; src = fetchurl { - url = "mirror://sourceforge/freemind/freemind-src-${version}.tar.gz"; - sha256 = "06c6pm7hpwh9hbmyah3lj2wp1g957x8znfwc5cwygsi7dc98b0h1"; + url = "mirror://sourceforge/freemind/freemind-src-${finalAttrs.version}.tar.gz"; + hash = "sha256-AYKFEmsn6uc5K4w7+1E/Jb1wuZB0QOXrggnyC0+9hhk="; }; - buildInputs = [ jdk ant ]; + nativeBuildInputs = [ + ant + jdk + makeWrapper + stripJavaArchivesHook + ]; + + postPatch = '' + # disable the task because it would edit version.properties + # and add a "last edited" header to it, which is non-deterministic + sed -i '/$out/bin/freemind <