From ddbf20ac62396461016acadb9a9abb4e435f9740 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 17 May 2024 18:19:13 +0400
Subject: [PATCH 1/2] =?UTF-8?q?openjump:=201.15=20=E2=86=92=202.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/openjump/default.nix | 32 +++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix
index e1eceab49647..003d330cb372 100644
--- a/pkgs/applications/misc/openjump/default.nix
+++ b/pkgs/applications/misc/openjump/default.nix
@@ -1,40 +1,42 @@
 { lib, stdenv, fetchurl, unzip, makeWrapper
 , coreutils, gawk, which, gnugrep, findutils
-, jdk
+, jre
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "openjump";
-  version = "1.15";
+  version = "2.2.1";
+  revision = "r5222%5B94156e5%5D";
 
   src = fetchurl {
-    url = "mirror://sourceforge/jump-pilot/OpenJUMP/1.15/OpenJUMP-Portable-1.15-r6241-CORE.zip";
-    sha256 = "12snzkv83w6khcdqzp6xahqapwp82af6c7j2q8n0lj62hk79rfgl";
+    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/bin;
-    cd $out; unzip $src
+    mkdir -p $out/opt
+    unzip $src -d $out/opt
   '';
 
   nativeBuildInputs = [ makeWrapper unzip ];
 
   installPhase = ''
-    dir=$(echo $out/OpenJUMP-*)
+    dir=$(echo $out/opt/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"
+    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/index.html";
+    homepage = "http://www.openjump.org/";
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
     license = lib.licenses.gpl2;
-    maintainers = [lib.maintainers.marcweber];
-    platforms = lib.platforms.linux;
+    maintainers = lib.teams.geospatial.members ++ [ lib.maintainers.marcweber ];
+    platforms = jre.meta.platforms;
     mainProgram = "OpenJump";
   };
 }

From 0f353660e33e1be3851ec392d2cbb549aa99e994 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 17 May 2024 19:22:03 +0400
Subject: [PATCH 2/2] openjump: migrate to by-name

---
 .../openjump/default.nix => by-name/op/openjump/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/openjump/default.nix => by-name/op/openjump/package.nix} (100%)

diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/by-name/op/openjump/package.nix
similarity index 100%
rename from pkgs/applications/misc/openjump/default.nix
rename to pkgs/by-name/op/openjump/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 160b65391fea..7b3841605193 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33475,8 +33475,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 { };