java-service-wrapper: make deterministic, do some cleanup (#295154)

authored by

Toma and committed by
GitHub
268ec3b4 dfb2af50

+8 -6
+8 -6
pkgs/by-name/ja/java-service-wrapper/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchurl, 5 + ant, 5 6 jdk, 6 - ant, 7 + stripJavaArchivesHook, 7 8 cunit, 8 9 ncurses, 9 10 }: 10 11 11 - stdenv.mkDerivation rec { 12 + stdenv.mkDerivation (finalAttrs: { 12 13 pname = "java-service-wrapper"; 13 14 version = "3.6.0"; 14 15 15 16 src = fetchurl { 16 - url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; 17 + url = "https://wrapper.tanukisoftware.com/download/${finalAttrs.version}/wrapper_${finalAttrs.version}_src.tar.gz"; 17 18 hash = "sha256-b9H7teM3zIXvuek1UNlxlzjxPNPy82ElATAGT/Fvjgw="; 18 19 }; 19 20 ··· 27 28 nativeBuildInputs = [ 28 29 ant 29 30 jdk 31 + stripJavaArchivesHook 30 32 ]; 31 33 32 34 postConfigure = '' 33 35 substituteInPlace default.properties \ 34 - --replace "javac.target.version=1.4" "javac.target.version=8" 36 + --replace-fail "javac.target.version=1.4" "javac.target.version=8" 35 37 ''; 36 38 37 39 buildPhase = '' ··· 60 62 meta = with lib; { 61 63 description = "Enables a Java Application to be run as a Windows Service or Unix Daemon"; 62 64 homepage = "https://wrapper.tanukisoftware.com/"; 63 - changelog = "https://wrapper.tanukisoftware.com/doc/english/release-notes.html#${version}"; 65 + changelog = "https://wrapper.tanukisoftware.com/doc/english/release-notes.html#${finalAttrs.version}"; 64 66 license = licenses.gpl2Only; 65 67 platforms = [ 66 68 "x86_64-linux" ··· 74 76 # Tracking issue: https://github.com/NixOS/nixpkgs/issues/281557 75 77 broken = stdenv.hostPlatform.isMusl; 76 78 }; 77 - } 79 + })