diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-12-15 12:24:56 +0200 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2021-03-13 12:47:00 +0200 |
| commit | 9545bbadfa9a67c5c9a28aed951e3fcadb955dc9 (patch) | |
| tree | 94d3d12926407c526bd863cc71669223b27eafb3 | |
| parent | 99c3bdb9b610b8782abca17c36c7be51d28c9d30 (diff) | |
inspectrum: Refactor to use gnuradioMinimal.pkgs.mkDerivation
Use the same deps of gnuradioMinimal - thanks to gnuradio's
mkDerivation.
| -rw-r--r-- | pkgs/applications/radio/inspectrum/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix index 37131a686b52..3cc8c59cc026 100644 --- a/pkgs/applications/radio/inspectrum/default.nix +++ b/pkgs/applications/radio/inspectrum/default.nix @@ -1,17 +1,14 @@ { lib -, mkDerivation +, gnuradioMinimal , fetchFromGitHub , pkg-config , cmake -, boost , fftwFloat -, gnuradio +, qt5 , liquid-dsp -, qtbase -, wrapQtAppsHook }: -mkDerivation rec { +gnuradioMinimal.pkgs.mkDerivation rec { pname = "inspectrum"; version = "0.2.3"; @@ -22,13 +19,15 @@ mkDerivation rec { sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355"; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + qt5.wrapQtAppsHook + pkg-config + ]; buildInputs = [ fftwFloat - boost - gnuradio liquid-dsp - qtbase + qt5.qtbase ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bee79ffc8d0b..c43d5a1d9927 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23250,9 +23250,7 @@ in inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); - inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { - gnuradio = gnuradioMinimal; - }; + inspectrum = callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; |