qdmr: move to by-name (#420315)

2025-06-27 08:12:22 +02:00
parent f34a7b91e8 1c4aa0d63f
commit e9e6371500
2 changed files with 6 additions and 12 deletions
@@ -6,12 +6,8 @@
  cmake,
  libxslt,
  docbook_xsl_ns,
-  wrapQtAppsHook,
+  libsForQt5,
  libusb1,
-  qtlocation,
-  qtserialport,
-  qttools,
-  qtbase,
  yaml-cpp,
 }:

@@ -33,16 +29,16 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    cmake
    libxslt
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
    installShellFiles
  ];

  buildInputs = [
    libusb1
-    qtlocation
-    qtserialport
-    qttools
-    qtbase
+    libsForQt5.qtlocation
+    libsForQt5.qtserialport
+    libsForQt5.qttools
+    libsForQt5.qtbase
    yaml-cpp
  ];

@@ -514,8 +514,6 @@ with pkgs;
    python3Packages = python311Packages;
  };

-  qdmr = libsForQt5.callPackage ../applications/radio/qdmr { };
-
  fetchbower = callPackage ../build-support/fetchbower { };

  fetchbzr = callPackage ../build-support/fetchbzr { };