From f4d382182afdf082480c68effc51ce590249eb56 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 2 Apr 2026 12:48:16 -0500
Subject: [PATCH 1/2] engauge-digitizer: migrate to by-name

---
 .../en/engauge-digitizer/package.nix}           | 17 +++++++----------
 pkgs/top-level/all-packages.nix                 |  2 --
 2 files changed, 7 insertions(+), 12 deletions(-)
 rename pkgs/{applications/science/math/engauge-digitizer/default.nix => by-name/en/engauge-digitizer/package.nix} (85%)

diff --git a/pkgs/applications/science/math/engauge-digitizer/default.nix b/pkgs/by-name/en/engauge-digitizer/package.nix
similarity index 85%
rename from pkgs/applications/science/math/engauge-digitizer/default.nix
rename to pkgs/by-name/en/engauge-digitizer/package.nix
index db0c64ed1487..e2a9ae520747 100644
--- a/pkgs/applications/science/math/engauge-digitizer/default.nix
+++ b/pkgs/by-name/en/engauge-digitizer/package.nix
@@ -7,11 +7,8 @@
   log4cpp,
   openjpeg,
   libpng12,
-  poppler,
-  qtbase,
+  libsForQt5,
   qt5,
-  qmake,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -26,14 +23,14 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    qt5.qmake
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt5.qtbase
     qt5.qttools
-    poppler
+    libsForQt5.poppler
     libpng12
     openjpeg
     openjpeg.dev
@@ -49,9 +46,9 @@ stdenv.mkDerivation rec {
   ];
 
   env = {
-    POPPLER_INCLUDE = "${poppler.dev}/include/poppler/qt5";
+    POPPLER_INCLUDE = "${libsForQt5.poppler.dev}/include/poppler/qt5";
 
-    POPPLER_LIB = "${poppler}/lib";
+    POPPLER_LIB = "${libsForQt5.poppler}/lib";
 
     OPENJPEG_INCLUDE = "${openjpeg.dev}/include/${openjpeg.pname}-${lib.versions.majorMinor openjpeg.version}";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30cc67350b58..cb6a2921610a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2225,8 +2225,6 @@ with pkgs;
 
   dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { };
 
-  engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { };
-
   rocmPackages = recurseIntoAttrs (callPackage ../development/rocm-modules { });
 
   tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };

From 6b9de8a599f7e5c4849d74a25f5594b713527785 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 2 Apr 2026 12:51:56 -0500
Subject: [PATCH 2/2] engauge-digitizer: refactor derivation

---
 pkgs/by-name/en/engauge-digitizer/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/en/engauge-digitizer/package.nix b/pkgs/by-name/en/engauge-digitizer/package.nix
index e2a9ae520747..c331bdaa9c95 100644
--- a/pkgs/by-name/en/engauge-digitizer/package.nix
+++ b/pkgs/by-name/en/engauge-digitizer/package.nix
@@ -11,15 +11,15 @@
   qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "engauge-digitizer";
   version = "12.2.2";
 
   src = fetchFromGitHub {
     owner = "akhuettel";
     repo = "engauge-digitizer";
-    rev = "v${version}";
-    sha256 = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY=";
   };
 
   nativeBuildInputs = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
     POPPLER_LIB = "${libsForQt5.poppler}/lib";
 
-    OPENJPEG_INCLUDE = "${openjpeg.dev}/include/${openjpeg.pname}-${lib.versions.majorMinor openjpeg.version}";
+    OPENJPEG_INCLUDE = "${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}";
 
     OPENJPEG_LIB = "${openjpeg}/lib";
   };
@@ -72,4 +72,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.sheepforce ];
   };
-}
+})