talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

josm: revert workaround to broken fetchsvn

Browse Source 
re #356829
This commit is contained in:
Andrew Kvalheim 2024-11-25 21:57:40 -08:00 committed by Robert Helgesson
parent 9512947ff9
commit a098e80118
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/by-name/jo/josm/package.nix
View File

@ -2,7 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchurl, fetchurl,
fetchFromGitHub, fetchsvn,
makeWrapper, makeWrapper,
unzip, unzip,
jre, jre,
@ -21,11 +21,10 @@ let
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
hash = "sha256-8eps1eTUn9FHHYwECH/742PV7wnnRO08dlZmaxd1aZU="; hash = "sha256-8eps1eTUn9FHHYwECH/742PV7wnnRO08dlZmaxd1aZU=";
}; };
pkg = fetchFromGitHub { pkg = fetchsvn {
owner = "JOSM"; url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
repo = "josm"; rev = version;
tag = "${version}-tested"; hash = "sha256-4mK+IdVRDhINJqzOovw7YPNiJmFxTCIfYVNMXKSdBv0=";
hash = "sha256-ke8+JMFx95WyYR+ZIbjUVh3CT72bAfiMBGkc0Mim+60=";
}; };
}; };
@ -53,7 +52,7 @@ stdenv.mkDerivation {
else else
'' ''
install -Dm644 ${srcs.jar} $out/share/josm/josm.jar install -Dm644 ${srcs.jar} $out/share/josm/josm.jar
cp -R ${srcs.pkg}/native/linux/tested/usr/share $out cp -R ${srcs.pkg}/usr/share $out
# Add libXxf86vm to path because it is needed by at least Kendzi3D plugin # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
makeWrapper ${jre}/bin/java $out/bin/josm \ makeWrapper ${jre}/bin/java $out/bin/josm \