engauge-digitizer: migrate to by-name, refactor (#506071)

pkgs/by-name/en/engauge-digitizer/package.nix

@@ -7,33 +7,30 @@
   log4cpp,
   openjpeg,
   libpng12,
-  poppler,
-  qtbase,
+  libsForQt5,
   qt5,
-  qmake,
-  wrapQtAppsHook,
 }:
 
-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 = [
-    qmake
-    wrapQtAppsHook
+    qt5.qmake
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt5.qtbase
     qt5.qttools
-    poppler
+    libsForQt5.poppler
     libpng12
     openjpeg
     openjpeg.dev
@@ -49,11 +46,11 @@ 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}";
+    OPENJPEG_INCLUDE = "${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}";
 
     OPENJPEG_LIB = "${openjpeg}/lib";
   };
@@ -75,4 +72,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.sheepforce ];
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -2219,8 +2219,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; };