ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 06:14:26 +03:00
Code Issues Projects Releases Wiki Activity

Using the OpenJDK currency date patch for icedtea

Browse Source
This commit is contained in:
Michael Raskin 2015-01-01 16:41:03 +03:00
parent fdb785f4d1
commit 1d835a2cbd
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/icedtea/currency-date-range.patch Normal file
View File

@ -0,0 +1,14 @@
diff -Naur openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
+++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java 2014-12-30 10:15:50.327905933 -0430
@@ -281,8 +281,8 @@
checkCurrencyCode(newCurrency);
String timeString = currencyInfo.substring(4, length - 4);
long time = format.parse(timeString).getTime();
- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
- throw new RuntimeException("time is more than 10 years from present: " + time);
+ if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
+ throw new RuntimeException("time is more than 20 years from present: " + time);
}
specialCaseCutOverTimes[specialCaseCount] = time;
specialCaseOldCurrencies[specialCaseCount] = oldCurrency;

1
pkgs/development/compilers/icedtea/default.nix
View File

@ -80,6 +80,7 @@ with srcInfo; stdenv.mkDerivation {
patch -p0 < ${./cppflags-include-fix.patch} patch -p0 < ${./cppflags-include-fix.patch}
patch -p0 < ${./fix-java-home.patch} patch -p0 < ${./fix-java-home.patch}
patch -p0 < ${./currency-date-range.patch}
''; '';
NIX_NO_SELF_RPATH = true; NIX_NO_SELF_RPATH = true;