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; };