Skip to content

Commit 8bb9de5

Browse files
committed
svxlink: modernize
1 parent 88ff20c commit 8bb9de5

1 file changed

Lines changed: 16 additions & 31 deletions

File tree

pkgs/by-name/sv/svxlink/package.nix

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
cmake,
55
pkg-config,
66
fetchFromGitHub,
7-
makeDesktopItem,
87
alsa-lib,
98
speex,
109
libopus,
1110
curl,
1211
gsm,
1312
libgcrypt,
13+
libgpiod_1,
1414
libsigcxx,
1515
popt,
1616
qt5,
@@ -21,68 +21,53 @@
2121
jsoncpp,
2222
}:
2323

24-
let
25-
desktopItem = makeDesktopItem rec {
26-
name = "Qtel";
27-
exec = "qtel";
28-
icon = "qtel";
29-
desktopName = name;
30-
genericName = "EchoLink Client";
31-
categories = [
32-
"HamRadio"
33-
"Qt"
34-
"Network"
35-
];
36-
};
37-
38-
in
39-
stdenv.mkDerivation rec {
24+
stdenv.mkDerivation (finalAttrs: {
4025
pname = "svxlink";
4126
version = "25.05.1";
4227

4328
src = fetchFromGitHub {
4429
owner = "sm0svx";
4530
repo = "svxlink";
46-
tag = version;
31+
tag = finalAttrs.version;
4732
hash = "sha256-OyAR/6heGX6J53p6x+ZPXY6nzSv22umMTg0ISlWcjp8=";
4833
};
4934

35+
sourceRoot = "${finalAttrs.src.name}/src";
36+
5037
cmakeFlags = [
51-
"-DDO_INSTALL_CHOWN=NO"
52-
"-DRTLSDR_LIBRARIES=${rtl-sdr}/lib/librtlsdr.so"
53-
"-DRTLSDR_INCLUDE_DIRS=${rtl-sdr}/include"
54-
"../src"
38+
(lib.cmakeBool "DO_INSTALL_CHOWN" false)
39+
(lib.cmakeFeature "RTLSDR_LIBRARIES" "${rtl-sdr}/lib/librtlsdr.so")
40+
(lib.cmakeFeature "RTLSDR_INCLUDE_DIRS" "${rtl-sdr}/include")
5541
];
5642

5743
dontWrapQtApps = true;
5844

5945
nativeBuildInputs = [
6046
cmake
61-
pkg-config
6247
doxygen
6348
groff
49+
pkg-config
50+
qt5.qttools
6451
qt5.wrapQtAppsHook
6552
];
6653

6754
buildInputs = [
6855
alsa-lib
6956
curl
7057
gsm
58+
jsoncpp
7159
libgcrypt
72-
libsigcxx
60+
libgpiod_1
7361
libopus
62+
libsigcxx
7463
popt
7564
qt5.qtbase
76-
qt5.qttools
7765
rtl-sdr
7866
speex
7967
tcl
80-
jsoncpp
8168
];
8269

8370
postInstall = ''
84-
rm -rf $out/share/applications
85-
ln -s ${desktopItem}/share/applications $out/share/applications
8671
wrapQtApp $out/bin/qtel
8772
'';
8873

@@ -92,9 +77,9 @@ stdenv.mkDerivation rec {
9277
Advanced repeater controller and EchoLink software for Linux including a
9378
GUI, Qtel - The Qt EchoLink client
9479
'';
95-
homepage = "http://www.svxlink.org/";
96-
license = with lib.licenses; [ gpl2 ];
80+
homepage = "https://www.svxlink.org/";
81+
license = with lib.licenses; [ gpl2Plus ];
9782
maintainers = with lib.maintainers; [ zaninime ];
9883
platforms = lib.platforms.linux;
9984
};
100-
}
85+
})

0 commit comments

Comments
 (0)