Merge pull request #297193 from TomaSajt/jna

jna: make deterministic and clean up
This commit is contained in:
Nick Cao 2024-04-08 10:36:11 -04:00 committed by GitHub
commit 1b8bf20b1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions

View File

@ -1,17 +1,17 @@
{ stdenv, lib, fetchFromGitHub, ant, jdk8 }:
{ stdenv, lib, fetchFromGitHub, ant, jdk, stripJavaArchivesHook }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "jna";
version = "5.14.0";
src = fetchFromGitHub {
owner = "java-native-access";
repo = pname;
rev = version;
repo = "jna";
rev = finalAttrs.version;
hash = "sha256-a5l9khKLWfvTHv53utfbw344/UNQOnIU93+wZNQ0ji4=";
};
nativeBuildInputs = [ ant jdk8 ];
nativeBuildInputs = [ ant jdk stripJavaArchivesHook ];
buildPhase = ''
runHook preBuild
@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
inherit (src.meta) homepage;
changelog = "https://github.com/java-native-access/jna/blob/${finalAttrs.version}/CHANGES.md";
description = "Java Native Access";
homepage = "https://github.com/java-native-access/jna";
license = with licenses; [ lgpl21 asl20 ];
maintainers = with maintainers; [ nagy ];
platforms = platforms.linux ++ platforms.darwin;
changelog = "https://github.com/java-native-access/jna/blob/${version}/CHANGES.md";
};
}
})