diff --git a/pkgs/applications/misc/projectlibre/default.nix b/pkgs/by-name/pr/projectlibre/package.nix similarity index 80% rename from pkgs/applications/misc/projectlibre/default.nix rename to pkgs/by-name/pr/projectlibre/package.nix index fbb25f30d41b..b1fb70ed9e27 100644 --- a/pkgs/applications/misc/projectlibre/default.nix +++ b/pkgs/by-name/pr/projectlibre/package.nix @@ -2,30 +2,32 @@ lib, stdenv, fetchgit, + ant, jdk, - stripJavaArchivesHook, makeWrapper, - jre, + stripJavaArchivesHook, + coreutils, + jre, which, }: stdenv.mkDerivation (finalAttrs: { pname = "projectlibre"; - version = "1.9.3"; + version = "1.9.8"; src = fetchgit { url = "https://git.code.sf.net/p/projectlibre/code"; - rev = "20814e88dc83694f9fc6780c2550ca5c8a87aa16"; # version 1.9.3 was not tagged - hash = "sha256-yXgYyy3jWxYMXKsNCRWdO78gYRmjKpO9U5WWU6PtwMU="; + rev = "0530be227f4a10c5545cce8d3db20ac5a4d76a66"; # version 1.9.8 was not tagged + hash = "sha256-eGoPtHy1XfPLnJXNDOMcek4spNKkNyZdby0IsZFZfME="; }; nativeBuildInputs = [ ant jdk - stripJavaArchivesHook makeWrapper + stripJavaArchivesHook ]; runtimeDeps = [ @@ -34,8 +36,6 @@ stdenv.mkDerivation (finalAttrs: { which ]; - env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8"; - buildPhase = '' runHook preBuild ant -f projectlibre_build/build.xml @@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: { popd substituteInPlace $out/bin/projectlibre \ - --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre" + --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre" wrapProgram $out/bin/projectlibre \ - --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98db1754b3cd..175947f82856 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4259,11 +4259,6 @@ with pkgs; polaris-web = callPackage ../servers/polaris/web.nix { }; - projectlibre = callPackage ../applications/misc/projectlibre { - jre = jre8; - jdk = jdk8; - }; - projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { }; proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };