josm: 18969 -> 19017
This commit is contained in:
parent
07198ee860
commit
b65eea32a4
1 changed files with 12 additions and 5 deletions
|
@ -3,22 +3,29 @@
|
|||
}:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "18969";
|
||||
version = "19017";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
hash = "sha256-a8muRwE4+9WdYVz7lYE9dRnqVIGQxL8cFmIdBr2R65U=";
|
||||
hash = "sha256-+PSsvauVe+e+qB7sz9AFmC/dZhWHFHe0zWYPEhgvRIQ=";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
|
||||
hash = "sha256-npXY7WJM1+9ygeAw102UtimnI/yXqs5vgPnatm4AIrI=";
|
||||
hash = "sha256-QYvAC+W7gHC5unwfcbQ0sz5U1VkMwIIUkDWQK9vDe2A=";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||
rev = version;
|
||||
sha256 = "sha256-RFZGRTDdWP/goH/Ev16nhq1SjxYkfFr3djwSrotK7Fo=";
|
||||
sha256 = "sha256-Pb4EAyvERz6kP3EmkgmUy/58KQHhBJmZJvpAj72GCIk=";
|
||||
};
|
||||
};
|
||||
|
||||
# Needed as of version 19017.
|
||||
baseJavaOpts = toString [
|
||||
"--add-exports=java.base/sun.security.action=ALL-UNNAMED"
|
||||
"--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED"
|
||||
"--add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
|
@ -38,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
|
||||
makeWrapper ${jre}/bin/java $out/bin/josm \
|
||||
--add-flags "${extraJavaOpts} -jar $out/share/josm/josm.jar" \
|
||||
--add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \
|
||||
--prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib'
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue