cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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
, 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; {

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

@ -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;