Merge pull request #297193 from TomaSajt/jna

jna: make deterministic and clean up

authored by Nick Cao and committed by GitHub 1b8bf20b 4df41642

+8 -8
+8 -8
pkgs/development/java-modules/jna/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, ant, jdk8 }: 1 + { stdenv, lib, fetchFromGitHub, ant, jdk, stripJavaArchivesHook }: 2 2 3 - stdenv.mkDerivation rec { 3 + stdenv.mkDerivation (finalAttrs: { 4 4 pname = "jna"; 5 5 version = "5.14.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "java-native-access"; 9 - repo = pname; 10 - rev = version; 9 + repo = "jna"; 10 + rev = finalAttrs.version; 11 11 hash = "sha256-a5l9khKLWfvTHv53utfbw344/UNQOnIU93+wZNQ0ji4="; 12 12 }; 13 13 14 - nativeBuildInputs = [ ant jdk8 ]; 14 + nativeBuildInputs = [ ant jdk stripJavaArchivesHook ]; 15 15 16 16 buildPhase = '' 17 17 runHook preBuild ··· 27 27 ''; 28 28 29 29 meta = with lib; { 30 - inherit (src.meta) homepage; 30 + changelog = "https://github.com/java-native-access/jna/blob/${finalAttrs.version}/CHANGES.md"; 31 31 description = "Java Native Access"; 32 + homepage = "https://github.com/java-native-access/jna"; 32 33 license = with licenses; [ lgpl21 asl20 ]; 33 34 maintainers = with maintainers; [ nagy ]; 34 35 platforms = platforms.linux ++ platforms.darwin; 35 - changelog = "https://github.com/java-native-access/jna/blob/${version}/CHANGES.md"; 36 36 }; 37 - } 37 + })