engauge-digitizer: migrate to by-name

This commit is contained in:
Guy Chronister
2026-04-12 15:10:54 +02:00
committed by Weijia Wang
parent 2b7a0a11c1
commit f4d382182a
2 changed files with 7 additions and 12 deletions
@@ -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}";
-2
View File
@@ -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; };