colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inspectrum: Refactor to use gnuradioMinimal.pkgs.mkDerivation

Browse Source 
Use the same deps of gnuradioMinimal - thanks to gnuradio's
mkDerivation.
This commit is contained in:
Doron Behar 2020-12-15 12:24:56 +02:00
parent 99c3bdb9b6
commit 9545bbadfa
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/radio/inspectrum/default.nix
View File

@ -1,17 +1,14 @@
{ lib { lib
, mkDerivation , gnuradioMinimal
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, cmake , cmake
, boost
, fftwFloat , fftwFloat
, gnuradio , qt5
, liquid-dsp , liquid-dsp
, qtbase
, wrapQtAppsHook
}: }:
mkDerivation rec { gnuradioMinimal.pkgs.mkDerivation rec {
pname = "inspectrum"; pname = "inspectrum";
version = "0.2.3"; version = "0.2.3";
@ -22,13 +19,15 @@ mkDerivation rec {
sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355"; sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355";
}; };
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; nativeBuildInputs = [
cmake
qt5.wrapQtAppsHook
pkg-config
];
buildInputs = [ buildInputs = [
fftwFloat fftwFloat
boost
gnuradio
liquid-dsp liquid-dsp
qtbase qt5.qtbase
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/top-level/all-packages.nix
View File

@ -23250,9 +23250,7 @@ in
inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});
inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { inspectrum = callPackage ../applications/radio/inspectrum { };
gnuradio = gnuradioMinimal;
};
ion3 = callPackage ../applications/window-managers/ion-3 { ion3 = callPackage ../applications/window-managers/ion-3 {
lua = lua5_1; lua = lua5_1;