diff --git a/pkgs/applications/networking/sniffers/savvycan/default.nix b/pkgs/by-name/sa/savvycan/package.nix similarity index 82% rename from pkgs/applications/networking/sniffers/savvycan/default.nix rename to pkgs/by-name/sa/savvycan/package.nix index 195412111d0e..210bf16bbbed 100644 --- a/pkgs/applications/networking/sniffers/savvycan/default.nix +++ b/pkgs/by-name/sa/savvycan/package.nix @@ -2,40 +2,39 @@ stdenv, lib, fetchFromGitHub, - qtbase, - qttools, - qmake, - qtserialbus, - qtserialport, - qtdeclarative, - wrapQtAppsHook, + qt5, }: stdenv.mkDerivation rec { - pname = "savvycan"; - version = "213"; + version = "220"; src = fetchFromGitHub { owner = "collin80"; repo = "SavvyCAN"; rev = "V${version}"; - hash = "sha256-duITY6s/uadeBCFuG42JbLCaq7yaYv1qB8Q3GA8UJ0A="; + hash = "sha256-Du6Pc0JePdJNwBaWKKjTMWOmKCnk6Azojh8IJ7I+ngY="; }; buildInputs = [ - qtbase - qttools - qtserialbus - qtserialport - qtdeclarative + qt5.qtbase + qt5.qttools + qt5.qtserialbus + qt5.qtserialport + qt5.qtdeclarative ]; nativeBuildInputs = [ - qmake - wrapQtAppsHook + qt5.qmake + qt5.wrapQtAppsHook ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/SavvyCAN.app $out/Applications + ln -s $out/Applications/SavvyCAN.app/Contents/MacOS/SavvyCAN $out/bin/SavvyCAN + ''; + meta = with lib; { description = "QT based cross platform canbus tool"; homepage = "https://savvycan.com/"; @@ -70,5 +69,4 @@ stdenv.mkDerivation rec { it! ''; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 348372db1cf5..ad1bacc7f5e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13952,8 +13952,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 { };