diff --git a/pkgs/applications/networking/sniffers/savvycan/default.nix b/pkgs/by-name/sa/savvycan/package.nix similarity index 91% rename from pkgs/applications/networking/sniffers/savvycan/default.nix rename to pkgs/by-name/sa/savvycan/package.nix index d30ddc8907b4..34f7d95d92e5 100644 --- a/pkgs/applications/networking/sniffers/savvycan/default.nix +++ b/pkgs/by-name/sa/savvycan/package.nix @@ -2,17 +2,10 @@ stdenv, lib, fetchFromGitHub, - qtbase, - qttools, - qmake, - qtserialbus, - qtserialport, - qtdeclarative, - wrapQtAppsHook, + qt5, }: stdenv.mkDerivation rec { - pname = "savvycan"; version = "220"; @@ -24,16 +17,16 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qtbase - qttools - qtserialbus - qtserialport - qtdeclarative + qt5.qtbase + qt5.qttools + qt5.qtserialbus + qt5.qtserialport + qt5.qtdeclarative ]; nativeBuildInputs = [ - qmake - wrapQtAppsHook + qt5.qmake + qt5.wrapQtAppsHook ]; meta = with lib; { @@ -70,5 +63,4 @@ stdenv.mkDerivation rec { it! ''; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aada23abf900..f7f94a27569e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13987,8 +13987,6 @@ with pkgs; rusty-psn-gui = rusty-psn.override { withGui = true; }; - savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan { }; - sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { };