Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ede34af62e7b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 005fb92d32c9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 31, 2019

  1. josm: fix support for kendzi3d plugin

    @jluttine @rycee
    jluttine authored and rycee committed Mar 31, 2019
    Copy the full SHA
    005fb92 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/applications/misc/josm/default.nix
6 changes: 4 additions & 2 deletions pkgs/applications/misc/josm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }:
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }:

stdenv.mkDerivation rec {
name = "josm-${version}";
@@ -21,12 +21,14 @@ stdenv.mkDerivation rec {
categories = "Education;Geoscience;Maps;";
};

# Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
buildCommand = ''
mkdir -p $out/bin $out/share/java
cp -v $src $out/share/java/josm.jar
makeWrapper ${jdk11}/bin/java $out/bin/josm \
--add-flags "-jar $out/share/java/josm.jar"
--add-flags "-jar $out/share/java/josm.jar" \
--prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib'
mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications