diff options
| author | Nikolay Korotkiy <sikmir@gmail.com> | 2021-04-28 17:51:32 +0300 |
|---|---|---|
| committer | Nikolay Korotkiy <sikmir@gmail.com> | 2021-04-30 09:19:32 +0300 |
| commit | 352bc1f2699fcaae0fec21eaa792d18593494b4b (patch) | |
| tree | 6cd8c84caa3d270c356ef5a6c3c59066f0aa8a00 /pkgs/applications/misc/josm | |
| parent | e340874c85b40f924c8cb285cf5da60b0fc6f8d3 (diff) | |
| download | nixpkgs-352bc1f2699fcaae0fec21eaa792d18593494b4b.tar nixpkgs-352bc1f2699fcaae0fec21eaa792d18593494b4b.tar.gz nixpkgs-352bc1f2699fcaae0fec21eaa792d18593494b4b.tar.bz2 nixpkgs-352bc1f2699fcaae0fec21eaa792d18593494b4b.tar.lz nixpkgs-352bc1f2699fcaae0fec21eaa792d18593494b4b.tar.xz nixpkgs-352bc1f2699fcaae0fec21eaa792d18593494b4b.tar.zst nixpkgs-352bc1f2699fcaae0fec21eaa792d18593494b4b.zip | |
josm: 17702 → 17833
Diffstat (limited to 'pkgs/applications/misc/josm')
| -rw-r--r-- | pkgs/applications/misc/josm/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index badda6b17ee..aa1ef4f8eff 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: +{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm +, extraJavaOpts ? "-Djosm.restart=true -Djava.net.useSystemProxies=true" +}: let pname = "josm"; - version = "17702"; + version = "17833"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1p7p0jd87sxrs5n0r82apkilx0phgmjw7vpdg8qrr5msda4rsmpk"; + sha256 = "sha256-i3seRVfCLXNvUkWAAPZK0XloRHuXWCNp1tqnVr7CQ7Y="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "0r17cphxm852ykb8mkil29rr7sb0bj5w69qd5wz8zf2f9djk9npk"; + sha256 = "sha256-PM/wNXqtEwalhorWHqVHWsaiGv60SFrHXZrb1Mw/QqQ="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "1b7dryvakph8znh2ahgywch66l4bl5rmgsr79axnz1xi12g8ac12"; + sha256 = "sha256-IjCFngixh2+7SifrV3Ohi1BjIOP+QSWg/QjeqbbP7aw="; }; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit pname version; dontUnpack = true; @@ -36,8 +38,7 @@ stdenv.mkDerivation { # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin makeWrapper ${jre}/bin/java $out/bin/josm \ - --add-flags "-Djosm.restart=true -Djava.net.useSystemProxies=true" \ - --add-flags "-jar $out/share/josm/josm.jar" \ + --add-flags "${extraJavaOpts} -jar $out/share/josm/josm.jar" \ --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' ''; |