From 18eb4531cd291303e6ade31f07a4e72a8cadcc82 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 21 Oct 2021 11:25:21 +0300 Subject: [PATCH] gnuradio-wrapped: Assume that wrapping is done with python-support Add all needed pythonPkgs to the list without checking if the python-support feature is set. --- pkgs/applications/radio/gnuradio/wrapper.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 7dcb6d467d62..58205f388f25 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -33,7 +33,10 @@ }: let + # We don't check if `python-support` feature is on, as it's unlikely someone + # may wish to wrap GR without python support. pythonPkgs = extraPythonPackages + ++ [ (unwrapped.python.pkgs.toPythonModule unwrapped) ] # Add the extraPackages as python modules as well ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) ++ lib.flatten (lib.mapAttrsToList ( @@ -44,14 +47,6 @@ let [] ) ) unwrapped.featuresInfo) - ++ lib.optionals - (unwrapped.hasFeature "python-support" unwrapped.features) - ( - # Add unwrapped itself as a python module - [ (unwrapped.python.pkgs.toPythonModule unwrapped) ] - # Add all extraPackages as python modules - ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) - ) ; pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs);