Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

josm: fix support for kendzi3d plugin

(cherry picked from commit 005fb92d32c9d5b636846ce30ae01aab81454161)

authored by

Jaakko Luttinen and committed by
Franz Pletz
2878299a 16956c6c

+4 -2
+4 -2
pkgs/applications/misc/josm/default.nix
··· 1 - { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: 1 + { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "josm-${version}"; ··· 21 21 categories = "Education;Geoscience;Maps;"; 22 22 }; 23 23 24 + # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin 24 25 buildCommand = '' 25 26 mkdir -p $out/bin $out/share/java 26 27 cp -v $src $out/share/java/josm.jar 27 28 28 29 makeWrapper ${jdk11}/bin/java $out/bin/josm \ 29 - --add-flags "-jar $out/share/java/josm.jar" 30 + --add-flags "-jar $out/share/java/josm.jar" \ 31 + --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' 30 32 31 33 mkdir -p $out/share/applications 32 34 cp $desktopItem/share/applications"/"* $out/share/applications