pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #306766 from TomaSajt/projectlibre

projectlibre: 1.7.0 -> 1.9.3

authored by

Weijia Wang and committed by
GitHub faada32c 91bd5a55

+31 -20
+31 -20
pkgs/applications/misc/projectlibre/default.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchgit 4 - , ant 5 - , jdk 6 - , stripJavaArchivesHook 7 - , makeWrapper 8 - , jre 9 - , coreutils 10 - , which 1 + { 2 + lib, 3 + stdenv, 4 + fetchgit, 5 + ant, 6 + jdk, 7 + stripJavaArchivesHook, 8 + makeWrapper, 9 + jre, 10 + coreutils, 11 + which, 11 12 }: 12 13 13 - stdenv.mkDerivation { 14 + stdenv.mkDerivation (finalAttrs: { 14 15 pname = "projectlibre"; 15 - version = "1.7.0"; 16 + version = "1.9.3"; 16 17 17 18 src = fetchgit { 18 19 url = "https://git.code.sf.net/p/projectlibre/code"; 19 - rev = "0c939507cc63e9eaeb855437189cdec79e9386c2"; # version 1.7.0 was not tagged 20 - hash = "sha256-eLUbsQkYuVQxt4px62hzfdUNg2zCL/VOSVEVctfbxW8="; 20 + rev = "20814e88dc83694f9fc6780c2550ca5c8a87aa16"; # version 1.9.3 was not tagged 21 + hash = "sha256-yXgYyy3jWxYMXKsNCRWdO78gYRmjKpO9U5WWU6PtwMU="; 21 22 }; 22 23 23 24 nativeBuildInputs = [ ··· 27 28 makeWrapper 28 29 ]; 29 30 31 + runtimeDeps = [ 32 + jre 33 + coreutils 34 + which 35 + ]; 36 + 37 + env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8"; 38 + 30 39 buildPhase = '' 31 40 runHook preBuild 32 - ant -f openproj_build/build.xml 41 + ant -f projectlibre_build/build.xml 33 42 runHook postBuild 34 43 ''; 35 44 ··· 38 47 39 48 mkdir -p $out/share/{projectlibre/samples,doc/projectlibre} 40 49 41 - pushd openproj_build 50 + pushd projectlibre_build 42 51 cp -R dist/* $out/share/projectlibre 43 52 cp -R license $out/share/doc/projectlibre 44 53 cp -R resources/samples/* $out/share/projectlibre/samples ··· 51 60 --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre" 52 61 53 62 wrapProgram $out/bin/projectlibre \ 54 - --prefix PATH : ${lib.makeBinPath [ jre coreutils which ]} 63 + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} 55 64 56 65 runHook postInstall 57 66 ''; ··· 61 70 homepage = "https://www.projectlibre.com/"; 62 71 license = lib.licenses.cpal10; 63 72 mainProgram = "projectlibre"; 64 - maintainers = with lib.maintainers; [ Mogria tomasajt ]; 73 + maintainers = with lib.maintainers; [ 74 + Mogria 75 + tomasajt 76 + ]; 65 77 platforms = jre.meta.platforms; 66 78 }; 67 - } 68 - 79 + })