diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2018-10-10 12:54:53 -0400 |
|---|---|---|
| committer | Matt McHenry <github@matt.mchenryfamily.org> | 2018-10-28 20:35:25 -0400 |
| commit | 1bd7b98c7975136ddd6183a155e90688fd5b3e43 (patch) | |
| tree | 89afdc4f0ad413e2f22e10d91a0ffea3f9303971 /pkgs/applications/misc | |
| parent | 8b5a7597592550614b2de79c31abb090afcb3a5f (diff) | |
| download | nixlib-1bd7b98c7975136ddd6183a155e90688fd5b3e43.tar nixlib-1bd7b98c7975136ddd6183a155e90688fd5b3e43.tar.gz nixlib-1bd7b98c7975136ddd6183a155e90688fd5b3e43.tar.bz2 nixlib-1bd7b98c7975136ddd6183a155e90688fd5b3e43.tar.lz nixlib-1bd7b98c7975136ddd6183a155e90688fd5b3e43.tar.xz nixlib-1bd7b98c7975136ddd6183a155e90688fd5b3e43.tar.zst nixlib-1bd7b98c7975136ddd6183a155e90688fd5b3e43.zip | |
openjdk: 10.0.2 -> 11.0.1
* the jre is no longer an official part of the jdk (jmod is recommended as a replacement when needing to create smaller runtime images) * darwin continues to use zulu from azul * apps that used 10 now use 11 (eclipse, bazel, josm)
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/josm/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 4f98ec1bba91..808ff2d6f610 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre10 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: stdenv.mkDerivation rec { name = "josm-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "102dph3479qskzf72cpb9139pq9ifka6pzna1c6s5rs2il6mfvsb"; }; - buildInputs = [ jre10 makeWrapper ]; + buildInputs = [ jdk11 makeWrapper ]; desktopItem = makeDesktopItem { name = "josm"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/josm.jar - makeWrapper ${jre10}/bin/java $out/bin/josm \ + makeWrapper ${jdk11}/bin/java $out/bin/josm \ --add-flags "-jar $out/share/java/josm.jar" mkdir -p $out/share/applications |