diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/by-name/sv/svxlink/package.nix similarity index 59% rename from pkgs/applications/radio/svxlink/default.nix rename to pkgs/by-name/sv/svxlink/package.nix index e3db5ce7eb2f..c26357a8ffb1 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/by-name/sv/svxlink/package.nix @@ -4,18 +4,16 @@ cmake, pkg-config, fetchFromGitHub, - makeDesktopItem, alsa-lib, speex, libopus, curl, gsm, libgcrypt, + libgpiod_1, libsigcxx, popt, - qtbase, - qttools, - wrapQtAppsHook, + qt5, rtl-sdr, tcl, doxygen, @@ -23,68 +21,53 @@ jsoncpp, }: -let - desktopItem = makeDesktopItem rec { - name = "Qtel"; - exec = "qtel"; - icon = "qtel"; - desktopName = name; - genericName = "EchoLink Client"; - categories = [ - "HamRadio" - "Qt" - "Network" - ]; - }; - -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "svxlink"; version = "25.05.1"; src = fetchFromGitHub { owner = "sm0svx"; repo = "svxlink"; - tag = version; + tag = finalAttrs.version; hash = "sha256-OyAR/6heGX6J53p6x+ZPXY6nzSv22umMTg0ISlWcjp8="; }; + sourceRoot = "${finalAttrs.src.name}/src"; + cmakeFlags = [ - "-DDO_INSTALL_CHOWN=NO" - "-DRTLSDR_LIBRARIES=${rtl-sdr}/lib/librtlsdr.so" - "-DRTLSDR_INCLUDE_DIRS=${rtl-sdr}/include" - "../src" + (lib.cmakeBool "DO_INSTALL_CHOWN" false) + (lib.cmakeFeature "RTLSDR_LIBRARIES" "${rtl-sdr}/lib/librtlsdr.so") + (lib.cmakeFeature "RTLSDR_INCLUDE_DIRS" "${rtl-sdr}/include") ]; dontWrapQtApps = true; nativeBuildInputs = [ cmake - pkg-config doxygen groff - wrapQtAppsHook + pkg-config + qt5.qttools + qt5.wrapQtAppsHook ]; buildInputs = [ alsa-lib curl gsm + jsoncpp libgcrypt - libsigcxx + libgpiod_1 libopus + libsigcxx popt - qtbase - qttools + qt5.qtbase rtl-sdr speex tcl - jsoncpp ]; postInstall = '' - rm -rf $out/share/applications - ln -s ${desktopItem}/share/applications $out/share/applications wrapQtApp $out/bin/qtel ''; @@ -94,9 +77,9 @@ stdenv.mkDerivation rec { Advanced repeater controller and EchoLink software for Linux including a GUI, Qtel - The Qt EchoLink client ''; - homepage = "http://www.svxlink.org/"; - license = with lib.licenses; [ gpl2 ]; + homepage = "https://www.svxlink.org/"; + license = with lib.licenses; [ gpl2Plus ]; maintainers = with lib.maintainers; [ zaninime ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c3c0bff12c8..c15ab3182a9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8735,8 +8735,6 @@ with pkgs; structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { }; - svxlink = libsForQt5.callPackage ../applications/radio/svxlink { }; - szurubooru = callPackage ../servers/web-apps/szurubooru { }; tclap = tclap_1_2;