From e954c8540ce8da90a872c1ea1e3ccb5fe23396be Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 13 Oct 2023 11:27:50 +0200 Subject: [PATCH] pkgs/jna: remove we now use the JNA from nixpkgs --- pkgs/default.nix | 1 - pkgs/epnix/tools/jna/default.nix | 44 -------------------------------- 2 files changed, 45 deletions(-) delete mode 100644 pkgs/epnix/tools/jna/default.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 09777425..18717718 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -55,7 +55,6 @@ with prev; # Other utilities - jna = callPackage ./epnix/tools/jna {}; mariadb_jdbc = callPackage ./epnix/tools/mariadb_jdbc {}; # EPNix specific packages diff --git a/pkgs/epnix/tools/jna/default.nix b/pkgs/epnix/tools/jna/default.nix deleted file mode 100644 index 515bff76..00000000 --- a/pkgs/epnix/tools/jna/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -# TODO: remove once we switch to NixOS 23.05 -{ - stdenv, - lib, - epnixLib, - fetchFromGitHub, - ant, - jdk8, -}: -stdenv.mkDerivation rec { - pname = "jna"; - version = "5.13.0"; - - src = fetchFromGitHub { - owner = "java-native-access"; - repo = pname; - rev = version; - hash = "sha256-EIOVmzQcnbL1NmxAaUVCMDvs9wpKqhP5iHAPoBVs3ho="; - }; - - 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 epnixLib.maintainers; [minijackson]; - platforms = platforms.linux; - changelog = "https://github.com/java-native-access/jna/blob/${version}/CHANGES.md"; - }; -}