Skip to content

Commit c3f4e53

Browse files
authored
svxlink: migrate to by-name, modernize (NixOS#448338)
2 parents abe2eb7 + 8bb9de5 commit c3f4e53

2 files changed

Lines changed: 19 additions & 38 deletions

File tree

pkgs/applications/radio/svxlink/default.nix renamed to pkgs/by-name/sv/svxlink/package.nix

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,87 +4,70 @@
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,
16-
qtbase,
17-
qttools,
18-
wrapQtAppsHook,
16+
qt5,
1917
rtl-sdr,
2018
tcl,
2119
doxygen,
2220
groff,
2321
jsoncpp,
2422
}:
2523

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

4528
src = fetchFromGitHub {
4629
owner = "sm0svx";
4730
repo = "svxlink";
48-
tag = version;
31+
tag = finalAttrs.version;
4932
hash = "sha256-OyAR/6heGX6J53p6x+ZPXY6nzSv22umMTg0ISlWcjp8=";
5033
};
5134

35+
sourceRoot = "${finalAttrs.src.name}/src";
36+
5237
cmakeFlags = [
53-
"-DDO_INSTALL_CHOWN=NO"
54-
"-DRTLSDR_LIBRARIES=${rtl-sdr}/lib/librtlsdr.so"
55-
"-DRTLSDR_INCLUDE_DIRS=${rtl-sdr}/include"
56-
"../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")
5741
];
5842

5943
dontWrapQtApps = true;
6044

6145
nativeBuildInputs = [
6246
cmake
63-
pkg-config
6447
doxygen
6548
groff
66-
wrapQtAppsHook
49+
pkg-config
50+
qt5.qttools
51+
qt5.wrapQtAppsHook
6752
];
6853

6954
buildInputs = [
7055
alsa-lib
7156
curl
7257
gsm
58+
jsoncpp
7359
libgcrypt
74-
libsigcxx
60+
libgpiod_1
7561
libopus
62+
libsigcxx
7663
popt
77-
qtbase
78-
qttools
64+
qt5.qtbase
7965
rtl-sdr
8066
speex
8167
tcl
82-
jsoncpp
8368
];
8469

8570
postInstall = ''
86-
rm -rf $out/share/applications
87-
ln -s ${desktopItem}/share/applications $out/share/applications
8871
wrapQtApp $out/bin/qtel
8972
'';
9073

@@ -94,9 +77,9 @@ stdenv.mkDerivation rec {
9477
Advanced repeater controller and EchoLink software for Linux including a
9578
GUI, Qtel - The Qt EchoLink client
9679
'';
97-
homepage = "http://www.svxlink.org/";
98-
license = with lib.licenses; [ gpl2 ];
80+
homepage = "https://www.svxlink.org/";
81+
license = with lib.licenses; [ gpl2Plus ];
9982
maintainers = with lib.maintainers; [ zaninime ];
10083
platforms = lib.platforms.linux;
10184
};
102-
}
85+
})

pkgs/top-level/all-packages.nix

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

87368736
structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { };
87378737

8738-
svxlink = libsForQt5.callPackage ../applications/radio/svxlink { };
8739-
87408738
szurubooru = callPackage ../servers/web-apps/szurubooru { };
87418739

87428740
tclap = tclap_1_2;

0 commit comments

Comments
 (0)