Merge pull request #312462 from sikmir/openjump

openjump: 1.15 → 2.2.1

3 files changed, 42 insertions, 42 deletions

diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix
deleted file mode 100644
index e1eceab496471..0000000000000
--- a/pkgs/applications/misc/openjump/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, stdenv, fetchurl, unzip, makeWrapper
-, coreutils, gawk, which, gnugrep, findutils
-, jdk
-}:
-
-stdenv.mkDerivation {
-  pname = "openjump";
-  version = "1.15";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/jump-pilot/OpenJUMP/1.15/OpenJUMP-Portable-1.15-r6241-CORE.zip";
-    sha256 = "12snzkv83w6khcdqzp6xahqapwp82af6c7j2q8n0lj62hk79rfgl";
-  };
-
-  # TODO: build from source
-  unpackPhase = ''
-    mkdir -p $out/bin;
-    cd $out; unzip $src
-  '';
-
-  nativeBuildInputs = [ makeWrapper unzip ];
-
-  installPhase = ''
-    dir=$(echo $out/OpenJUMP-*)
-
-    chmod +x $dir/bin/oj_linux.sh
-    makeWrapper $dir/bin/oj_linux.sh $out/bin/OpenJump \
-      --set JAVA_HOME ${jdk.home} \
-      --set PATH "${coreutils}/bin:${gawk}/bin:${which}/bin:${gnugrep}/bin:${findutils}/bin"
-  '';
-
-  meta = {
-    description = "Open source Geographic Information System (GIS) written in the Java programming language";
-    homepage = "http://www.openjump.org/index.html";
-    license = lib.licenses.gpl2;
-    maintainers = [lib.maintainers.marcweber];
-    platforms = lib.platforms.linux;
-    mainProgram = "OpenJump";
-  };
-}
diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix
new file mode 100644
index 0000000000000..003d330cb372e
--- /dev/null
+++ b/pkgs/by-name/op/openjump/package.nix
@@ -0,0 +1,42 @@
+{ lib, stdenv, fetchurl, unzip, makeWrapper
+, coreutils, gawk, which, gnugrep, findutils
+, jre
+}:
+
+stdenv.mkDerivation rec {
+  pname = "openjump";
+  version = "2.2.1";
+  revision = "r5222%5B94156e5%5D";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/jump-pilot/OpenJUMP/${version}/OpenJUMP-Portable-${version}-${revision}-PLUS.zip";
+    hash = "sha256-+/AMmD6NDPy+2Gq1Ji5i/QWGU7FOsU+kKsWoNXcx/VI=";
+  };
+
+  # TODO: build from source
+  unpackPhase = ''
+    mkdir -p $out/opt
+    unzip $src -d $out/opt
+  '';
+
+  nativeBuildInputs = [ makeWrapper unzip ];
+
+  installPhase = ''
+    dir=$(echo $out/opt/OpenJUMP-*)
+
+    chmod +x "$dir/bin/oj_linux.sh"
+    makeWrapper "$dir/bin/oj_linux.sh" $out/bin/OpenJump \
+      --set JAVA_HOME ${jre} \
+      --set PATH ${lib.makeBinPath [ coreutils gawk which gnugrep findutils ]}
+  '';
+
+  meta = {
+    description = "Open source Geographic Information System (GIS) written in the Java programming language";
+    homepage = "http://www.openjump.org/";
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    license = lib.licenses.gpl2;
+    maintainers = lib.teams.geospatial.members ++ [ lib.maintainers.marcweber ];
+    platforms = jre.meta.platforms;
+    mainProgram = "OpenJump";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab6d57f9450fd..cefca0ede9042 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33467,8 +33467,6 @@ with pkgs;
     openexr = openexr_3;
   };
 
-  openjump = callPackage ../applications/misc/openjump { };
-
   open-music-kontrollers = lib.recurseIntoAttrs {
     eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { };
     jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { };