colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #204315 from nagy/jna-init

Browse Source 
jna: init at 4.5.2
This commit is contained in:
Anderson Torres 2022-12-04 21:37:48 -03:00 committed by GitHub
commit 8e3d96849c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/networking/p2p/freenet/default.nix
View File

@ -1,15 +1,7 @@
{ lib, stdenv, fetchurl, jdk, bash, coreutils, substituteAll, nixosTests }:
{ lib, stdenv, fetchurl, jdk, bash, coreutils, substituteAll, nixosTests, jna }:
let
version = "build01494";
jna = fetchurl {
url = "https://github.com/freenet/fred/releases/download/${version}/jna-4.5.2.jar";
sha256 = "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=";
};
jna_platform = fetchurl {
url = "https://github.com/freenet/fred/releases/download/${version}/jna-platform-4.5.2.jar";
sha256 = "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=";
};
freenet_ext = fetchurl {
url = "https://github.com/freenet/fred/releases/download/${version}/freenet-ext.jar";
sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=";
@ -38,8 +30,8 @@ let
mkdir -p $out/share/freenet
ln -s ${bcprov} $out/share/freenet/bcprov.jar
ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar
ln -s ${jna_platform} $out/share/freenet/jna_platform.jar
ln -s ${jna} $out/share/freenet/jna.jar
ln -s ${jna}/share/java/jna-platform.jar $out/share/freenet/jna_platform.jar
ln -s ${jna}/share/java/jna.jar $out/share/freenet/jna.jar
ln -s $src $out/share/freenet/freenet.jar
'';
};
@ -71,5 +63,6 @@ in stdenv.mkDerivation {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ nagy ];
platforms = with lib.platforms; linux;
changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md";
};
}

37
pkgs/development/java-modules/jna/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, lib, fetchFromGitHub, ant, jdk8 }:
stdenv.mkDerivation rec {
pname = "jna";
version = "4.5.2";
src = fetchFromGitHub {
owner = "java-native-access";
repo = pname;
rev = version;
hash = "sha256-FJXYej49soHPa+kAUeLZYzbw+NnFoag2LdKrTihPWvE=";
};
nativeBuildInputs = [ ant jdk8 ];
buildPhase = ''
runHook preBuild
rm -r dist # remove prebuilt files
ant dist
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm444 -t $out/share/java dist/jna{,-platform}.jar
runHook postInstall
'';
meta = with lib; {
inherit (src.meta) homepage;
description = "Java Native Access";
license = with licenses; [ lgpl21 asl20 ];
maintainers = with maintainers; [ nagy ];
platforms = platforms.linux;
changelog = "https://github.com/java-native-access/jna/blob/${version}/CHANGES.md";
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -14696,6 +14696,8 @@ with pkgs;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
jna = callPackage ../development/java-modules/jna { };
javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };
juniper = callPackage ../development/compilers/juniper { };