File tree Expand file tree Collapse file tree 2 files changed +10
-15
lines changed Expand file tree Collapse file tree 2 files changed +10
-15
lines changed Original file line number Diff line number Diff line change 22 lib ,
33 stdenv ,
44 fetchgit ,
5+
56 ant ,
67 jdk ,
7- stripJavaArchivesHook ,
88 makeWrapper ,
9- jre ,
9+ stripJavaArchivesHook ,
10+
1011 coreutils ,
12+ jre ,
1113 which ,
1214} :
1315
1416stdenv . mkDerivation ( finalAttrs : {
1517 pname = "projectlibre" ;
16- version = "1.9.3 " ;
18+ version = "1.9.8 " ;
1719
1820 src = fetchgit {
1921 url = "https://git.code.sf.net/p/projectlibre/code" ;
20- rev = "20814e88dc83694f9fc6780c2550ca5c8a87aa16 " ; # version 1.9.3 was not tagged
21- hash = "sha256-yXgYyy3jWxYMXKsNCRWdO78gYRmjKpO9U5WWU6PtwMU =" ;
22+ rev = "0530be227f4a10c5545cce8d3db20ac5a4d76a66 " ; # version 1.9.8 was not tagged
23+ hash = "sha256-eGoPtHy1XfPLnJXNDOMcek4spNKkNyZdby0IsZFZfME =" ;
2224 } ;
2325
2426 nativeBuildInputs = [
2527 ant
2628 jdk
27- stripJavaArchivesHook
2829 makeWrapper
30+ stripJavaArchivesHook
2931 ] ;
3032
3133 runtimeDeps = [
@@ -34,8 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
3436 which
3537 ] ;
3638
37- env . JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8" ;
38-
3939 buildPhase = ''
4040 runHook preBuild
4141 ant -f projectlibre_build/build.xml
@@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
5757 popd
5858
5959 substituteInPlace $out/bin/projectlibre \
60- --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre"
60+ --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre"
6161
6262 wrapProgram $out/bin/projectlibre \
63- --prefix PATH : ${ lib . makeBinPath finalAttrs . runtimeDeps }
63+ --prefix PATH : ${ lib . makeBinPath finalAttrs . runtimeDeps }
6464
6565 runHook postInstall
6666 '' ;
Original file line number Diff line number Diff line change @@ -4234,11 +4234,6 @@ with pkgs;
42344234
42354235 polaris-web = callPackage ../servers/polaris/web.nix { };
42364236
4237- projectlibre = callPackage ../applications/misc/projectlibre {
4238- jre = jre8;
4239- jdk = jdk8;
4240- };
4241-
42424237 projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { };
42434238
42444239 proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };
You can’t perform that action at this time.
0 commit comments