@@ -8,32 +8,34 @@
88
99stdenv.mkDerivation rec {
1010 pname = "dapl" + lib.optionalString buildNativeImage "-native";
11− version = "0.2.0+unstable=2021-06-30";
11+ version = "0.2.0+date=2021-10-16";
1212
1313 src = fetchFromGitHub {
1414 owner = "dzaima";
1515 repo = "APL";
16− rev = "28b3667beb23c6472266bb2b6eb701708fa421c6";
17− hash = "sha256-2kM9XDMclxJNOZngwLvoDQG23UZQQ6ePK/j215UumCg=";
16+ rev = "5eb0a4205e27afa6122096a25008474eec562dc0";
17+ hash = "sha256-UdumMytqT909JRpNqzhYPuKPw644m/vRUsEbIVF2a7U=";
1818 };
1919
2020 nativeBuildInputs = [
21− makeWrapper
2221 jdk
22+ makeWrapper
2323 ];
2424
2525 dontConfigure = true;
2626
27+ postPatch = ''
28+ patchShebangs --build ./build
29+ '';
30+
2731 buildPhase = ''
2832 runHook preBuild
2933
30− patchShebangs --build ./build
31− substituteInPlace ./build \
32− --replace "javac" "javac -encoding utf8"
3334 ./build
3435 '' + lib.optionalString buildNativeImage ''
3536 native-image --report-unsupported-elements-at-runtime \
36− -H:CLibraryPath=${lib.getLib jdk}/lib -jar APL.jar dapl
37+ -H:CLibraryPath=${lib.getLib jdk}/lib -J-Dfile.encoding=UTF-8 \
38+ -jar APL.jar dapl
3739 '' + ''
3840 runHook postBuild
3941 '';