pyrox.dev / nixpkgs
lol
fork atom

inspectrum: Refactor to use gnuradioMinimal.pkgs.mkDerivation

Use the same deps of gnuradioMinimal - thanks to gnuradio's
mkDerivation.

Doron Behar 9545bbad 99c3bdb9

+10 -13
unified split
+9 -10
pkgs/applications/radio/inspectrum/default.nix
··· 1 1 { lib 2 - , mkDerivation 2 + , gnuradioMinimal 3 3 , fetchFromGitHub 4 4 , pkg-config 5 5 , cmake 6 - , boost 7 6 , fftwFloat 8 - , gnuradio 7 + , qt5 9 8 , liquid-dsp 10 - , qtbase 11 - , wrapQtAppsHook 12 9 }: 13 10 14 - mkDerivation rec { 11 + gnuradioMinimal.pkgs.mkDerivation rec { 15 12 pname = "inspectrum"; 16 13 version = "0.2.3"; 17 14 ··· 22 19 sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355"; 23 20 }; 24 21 25 - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; 22 + nativeBuildInputs = [ 23 + cmake 24 + qt5.wrapQtAppsHook 25 + pkg-config 26 + ]; 26 27 buildInputs = [ 27 28 fftwFloat 28 - boost 29 - gnuradio 30 29 liquid-dsp 31 - qtbase 30 + qt5.qtbase 32 31 ]; 33 32 34 33 meta = with lib; {
+1 -3
pkgs/top-level/all-packages.nix
··· 23250 23250 23251 23251 inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); 23252 23252 23253 - inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { 23254 - gnuradio = gnuradioMinimal; 23255 - }; 23253 + inspectrum = callPackage ../applications/radio/inspectrum { }; 23256 23254 23257 23255 ion3 = callPackage ../applications/window-managers/ion-3 { 23258 23256 lua = lua5_1;