sdrangel: migrate to by-name and self-contain callpackage.

pkgs/by-name/sd/sdrangel/package.nix

@@ -30,25 +30,14 @@
   ninja,
   opencv4,
   pkg-config,
-  qt5compat,
+  qt6,
-  qtcharts,
+  qt6Packages,
-  qtdeclarative,
-  qtlocation,
-  qtmultimedia,
-  qtscxml,
-  qtserialport,
-  qtspeech,
-  qttools,
-  qtwayland,
-  qtwebsockets,
-  qtwebengine,
   rtl-sdr,
   serialdv,
   sdrplay,
   sgp4,
   soapysdr-with-plugins,
   uhd,
-  wrapQtAppsHook,
   zlib,
   withSDRplay ? false,
 }:
@@ -60,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "sdrangel";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ymDKHGJNoCOMa1zzFvjTzFa34wP1+iKSfJZZi7Sk/GM=";
   };
 
@@ -68,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -96,17 +85,17 @@ stdenv.mkDerivation (finalAttrs: {
       limesuite
       mbelib
       opencv4
-      qt5compat
+      qt6Packages.qt5compat
-      qtcharts
+      qt6Packages.qtcharts
-      qtdeclarative
+      qt6Packages.qtdeclarative
-      qtlocation
+      qt6Packages.qtlocation
-      qtmultimedia
+      qt6Packages.qtmultimedia
-      qtscxml
+      qt6Packages.qtscxml
-      qtserialport
+      qt6Packages.qtserialport
-      qtspeech
+      qt6Packages.qtspeech
-      qttools
+      qt6Packages.qttools
-      qtwebsockets
+      qt6Packages.qtwebsockets
-      qtwebengine
+      qt6Packages.qtwebengine
       rtl-sdr
       serialdv
       sgp4
@@ -114,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
       uhd
       zlib
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
     ++ lib.optionals withSDRplay [ sdrplay ];
 

pkgs/top-level/all-packages.nix

@@ -11238,8 +11238,6 @@ with pkgs;
 
   sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { };
 
-  sdrangel = qt6Packages.callPackage ../applications/radio/sdrangel { };
-
   sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { };
 
   sgx-psw = callPackage ../os-specific/linux/sgx/psw {