diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/by-name/gu/guglielmo/package.nix similarity index 89% rename from pkgs/applications/radio/guglielmo/default.nix rename to pkgs/by-name/gu/guglielmo/package.nix index e1a81e9b40f1..513c244f6ca8 100644 --- a/pkgs/applications/radio/guglielmo/default.nix +++ b/pkgs/by-name/gu/guglielmo/package.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, pkg-config, @@ -9,14 +9,13 @@ fdk_aac, faad2, fftwFloat, + libsForQt5, libsndfile, libsamplerate, portaudio, - qtmultimedia, - qwt, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "guglielmo"; version = "0.5"; @@ -34,6 +33,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + libsForQt5.wrapQtAppsHook ]; buildInputs = [ airspy @@ -44,8 +44,8 @@ mkDerivation rec { libsndfile libsamplerate portaudio - qtmultimedia - qwt + libsForQt5.qtmultimedia + libsForQt5.qwt ]; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25ef040566e7..1c016abf7744 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1622,8 +1622,6 @@ with pkgs; go2tv-lite = go2tv.override { withGui = false; }; - guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { }; - hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; hwi = with python3Packages; toPythonApplication hwi;