Skip to content

Commit 028ee93

Browse files
authored
savvycan: 213 -> 220 (#405447)
2 parents d89fc19 + 99b679d commit 028ee93

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

pkgs/applications/networking/sniffers/savvycan/default.nix renamed to pkgs/by-name/sa/savvycan/package.nix

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,39 @@
22
stdenv,
33
lib,
44
fetchFromGitHub,
5-
qtbase,
6-
qttools,
7-
qmake,
8-
qtserialbus,
9-
qtserialport,
10-
qtdeclarative,
11-
wrapQtAppsHook,
5+
qt5,
126
}:
137

148
stdenv.mkDerivation rec {
15-
169
pname = "savvycan";
17-
version = "213";
10+
version = "220";
1811

1912
src = fetchFromGitHub {
2013
owner = "collin80";
2114
repo = "SavvyCAN";
2215
rev = "V${version}";
23-
hash = "sha256-duITY6s/uadeBCFuG42JbLCaq7yaYv1qB8Q3GA8UJ0A=";
16+
hash = "sha256-Du6Pc0JePdJNwBaWKKjTMWOmKCnk6Azojh8IJ7I+ngY=";
2417
};
2518

2619
buildInputs = [
27-
qtbase
28-
qttools
29-
qtserialbus
30-
qtserialport
31-
qtdeclarative
20+
qt5.qtbase
21+
qt5.qttools
22+
qt5.qtserialbus
23+
qt5.qtserialport
24+
qt5.qtdeclarative
3225
];
3326

3427
nativeBuildInputs = [
35-
qmake
36-
wrapQtAppsHook
28+
qt5.qmake
29+
qt5.wrapQtAppsHook
3730
];
3831

32+
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
33+
mkdir -p $out/Applications
34+
mv $out/bin/SavvyCAN.app $out/Applications
35+
ln -s $out/Applications/SavvyCAN.app/Contents/MacOS/SavvyCAN $out/bin/SavvyCAN
36+
'';
37+
3938
meta = with lib; {
4039
description = "QT based cross platform canbus tool";
4140
homepage = "https://savvycan.com/";
@@ -70,5 +69,4 @@ stdenv.mkDerivation rec {
7069
it!
7170
'';
7271
};
73-
7472
}

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13952,8 +13952,6 @@ with pkgs;
1395213952

1395313953
rusty-psn-gui = rusty-psn.override { withGui = true; };
1395413954

13955-
savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan { };
13956-
1395713955
sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
1395813956

1395913957
scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { };

0 commit comments

Comments
 (0)