diff options
Diffstat (limited to 'pkgs/applications/radio/gnuradio/default.nix')
| -rw-r--r-- | pkgs/applications/radio/gnuradio/default.nix | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index a443aec5367..d1f0a3fd6fb 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -45,11 +45,7 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, versionAttr ? { - major = "3.10"; - minor = "7"; - patch = "0"; -} +, version ? "3.10.7.0" }: let @@ -252,6 +248,11 @@ let gr-zeromq = { runtime = [ cppzmq ]; cmakeEnableFlag = "GR_ZEROMQ"; + pythonRuntime = [ + # Will compile without this, but it is required by tests, and by some + # gr blocks. + python.pkgs.pyzmq + ]; }; gr-network = { cmakeEnableFlag = "GR_NETWORK"; @@ -271,7 +272,7 @@ let removeReferencesTo featuresInfo features - versionAttr + version sourceSha256 overrideSrc fetchFromGitHub @@ -279,24 +280,14 @@ let qt = qt5; gtk = gtk3; }); - inherit (shared) hasFeature; # function + inherit (shared.passthru) hasFeature; # function in -stdenv.mkDerivation { - inherit pname; - inherit (shared) - version - src - nativeBuildInputs - buildInputs - cmakeFlags - disallowedReferences - stripDebugList - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; +stdenv.mkDerivation (finalAttrs: (shared // { + inherit pname version; + # Will still evaluate correctly if not used here. It only helps nix-update + # find the right file in which version is defined. + inherit (shared) src; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch @@ -332,4 +323,4 @@ stdenv.mkDerivation { ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; -} +})) |