From 9c32070f1f2090c4d5320b684792213d2cf6316b Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 19 May 2024 10:12:26 +0200
Subject: [PATCH 1/5] openjump: reformat with `nixfmt-rfc-style`

---
 pkgs/by-name/op/openjump/package.nix | 30 +++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix
index 003d330cb372..19e79b33ac1b 100644
--- a/pkgs/by-name/op/openjump/package.nix
+++ b/pkgs/by-name/op/openjump/package.nix
@@ -1,6 +1,15 @@
-{ lib, stdenv, fetchurl, unzip, makeWrapper
-, coreutils, gawk, which, gnugrep, findutils
-, jre
+{
+  lib,
+  stdenv,
+  fetchurl,
+  unzip,
+  makeWrapper,
+  coreutils,
+  gawk,
+  which,
+  gnugrep,
+  findutils,
+  jre,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +28,10 @@ stdenv.mkDerivation rec {
     unzip $src -d $out/opt
   '';
 
-  nativeBuildInputs = [ makeWrapper unzip ];
+  nativeBuildInputs = [
+    makeWrapper
+    unzip
+  ];
 
   installPhase = ''
     dir=$(echo $out/opt/OpenJUMP-*)
@@ -27,7 +39,15 @@ stdenv.mkDerivation rec {
     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 ]}
+      --set PATH ${
+        lib.makeBinPath [
+          coreutils
+          gawk
+          which
+          gnugrep
+          findutils
+        ]
+      }
   '';
 
   meta = {

From c3ccab0b92eec5962449c5469271f5966009d459 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 19 May 2024 10:13:18 +0200
Subject: [PATCH 2/5] openjump: use `finalAttrs` pattern

---
 pkgs/by-name/op/openjump/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix
index 19e79b33ac1b..76faf889df3f 100644
--- a/pkgs/by-name/op/openjump/package.nix
+++ b/pkgs/by-name/op/openjump/package.nix
@@ -12,13 +12,13 @@
   jre,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   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";
+    url = "mirror://sourceforge/jump-pilot/OpenJUMP/${finalAttrs.version}/OpenJUMP-Portable-${finalAttrs.version}-${finalAttrs.revision}-PLUS.zip";
     hash = "sha256-+/AMmD6NDPy+2Gq1Ji5i/QWGU7FOsU+kKsWoNXcx/VI=";
   };
 
@@ -59,4 +59,4 @@ stdenv.mkDerivation rec {
     platforms = jre.meta.platforms;
     mainProgram = "OpenJump";
   };
-}
+})

From 1c82c619e6def18f456a31892d24cdf027c26790 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 19 May 2024 10:14:10 +0200
Subject: [PATCH 3/5] openjump: add missing phase hooks

---
 pkgs/by-name/op/openjump/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix
index 76faf889df3f..08fc4c8c6678 100644
--- a/pkgs/by-name/op/openjump/package.nix
+++ b/pkgs/by-name/op/openjump/package.nix
@@ -24,8 +24,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   # TODO: build from source
   unpackPhase = ''
+    runHook preUnpack
     mkdir -p $out/opt
     unzip $src -d $out/opt
+    runHook postUnpack
   '';
 
   nativeBuildInputs = [
@@ -34,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   installPhase = ''
+    runHook preInstall
     dir=$(echo $out/opt/OpenJUMP-*)
 
     chmod +x "$dir/bin/oj_linux.sh"
@@ -48,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
           findutils
         ]
       }
+    runHook postInstall
   '';
 
   meta = {

From 120a1ee1260136cce385d450866cc432f2b78a94 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 19 May 2024 10:14:59 +0200
Subject: [PATCH 4/5] openjump: sort `meta` attributes

---
 pkgs/by-name/op/openjump/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix
index 08fc4c8c6678..e78fcc76e855 100644
--- a/pkgs/by-name/op/openjump/package.nix
+++ b/pkgs/by-name/op/openjump/package.nix
@@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
   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;
+    mainProgram = "OpenJump";
     maintainers = lib.teams.geospatial.members ++ [ lib.maintainers.marcweber ];
     platforms = jre.meta.platforms;
-    mainProgram = "OpenJump";
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
   };
 })

From 03dc987e7c6992d58892782b80728ae9293978c4 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 19 May 2024 10:15:33 +0200
Subject: [PATCH 5/5] openjump: use `makeBinaryWrapper`

---
 pkgs/by-name/op/openjump/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openjump/package.nix b/pkgs/by-name/op/openjump/package.nix
index e78fcc76e855..f527bdd11aba 100644
--- a/pkgs/by-name/op/openjump/package.nix
+++ b/pkgs/by-name/op/openjump/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   unzip,
-  makeWrapper,
+  makeBinaryWrapper,
   coreutils,
   gawk,
   which,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   nativeBuildInputs = [
-    makeWrapper
+    makeBinaryWrapper
     unzip
   ];