diff --git a/pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch b/pkgs/by-name/ya/yacas/jsoncpp-fix-include.patch similarity index 100% rename from pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch rename to pkgs/by-name/ya/yacas/jsoncpp-fix-include.patch diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/by-name/ya/yacas/package.nix similarity index 95% rename from pkgs/applications/science/math/yacas/default.nix rename to pkgs/by-name/ya/yacas/package.nix index d028f3fc93df..40a0784299a7 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/by-name/ya/yacas/package.nix @@ -6,9 +6,6 @@ cmake, perl, enableGui ? false, - qtbase, - wrapQtAppsHook, - qtwebengine, enableJupyter ? true, boost, jsoncpp, @@ -17,6 +14,7 @@ enableJava ? false, openjdk, gtest, + libsForQt5, }: stdenv.mkDerivation rec { @@ -69,9 +67,9 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ lib.optionals enableGui [ - qtbase - wrapQtAppsHook - qtwebengine + libsForQt5.qtbase + libsForQt5.wrapQtAppsHook + libsForQt5.qtwebengine ] ++ lib.optionals enableJupyter [ boost diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ff2d7f44708..7c8399ed26be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14001,8 +14001,6 @@ with pkgs; }; }; - yacas = libsForQt5.callPackage ../applications/science/math/yacas { }; - yacas-gui = yacas.override { enableGui = true; enableJupyter = false;