diff --git a/pkgs/applications/radio/pothos/cstring.patch b/pkgs/by-name/po/pothos/cstring.patch similarity index 100% rename from pkgs/applications/radio/pothos/cstring.patch rename to pkgs/by-name/po/pothos/cstring.patch diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/by-name/po/pothos/package.nix similarity index 94% rename from pkgs/applications/radio/pothos/default.nix rename to pkgs/by-name/po/pothos/package.nix index 005f44c14a6a..f4a275e28d32 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/by-name/po/pothos/package.nix @@ -6,12 +6,9 @@ cmake, pkg-config, doxygen, - wrapQtAppsHook, pcre, poco, - qtbase, - qtsvg, - qwt6_1, + libsForQt5, nlohmann_json, soapysdr-with-plugins, portaudio, @@ -20,14 +17,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pothos"; version = "0.7.1"; src = fetchFromGitHub { owner = "pothosware"; repo = "PothosCore"; - rev = "pothos-${version}"; + rev = "pothos-${finalAttrs.version}"; sha256 = "038c3ipvf4sgj0zhm3vcj07ymsva4ds6v89y43f5d3p4n8zc2rsg"; fetchSubmodules = true; }; @@ -67,15 +64,15 @@ stdenv.mkDerivation rec { cmake pkg-config doxygen - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ pcre poco - qtbase - qtsvg - qwt6_1 + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qwt6_1 nlohmann_json soapysdr-with-plugins portaudio @@ -113,4 +110,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/radio/pothos/spuce.patch b/pkgs/by-name/po/pothos/spuce.patch similarity index 100% rename from pkgs/applications/radio/pothos/spuce.patch rename to pkgs/by-name/po/pothos/spuce.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53e190609774..54c71beb8172 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10169,8 +10169,6 @@ with pkgs; plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); - pothos = libsForQt5.callPackage ../applications/radio/pothos { }; - # perhaps there are better apps for this task? It's how I had configured my previous system. # And I don't want to rewrite all rules profanity = callPackage ../applications/networking/instant-messengers/profanity (