diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index 3eac7df05476..a5722c9058ee 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -27,6 +27,10 @@ let cross = stdenv.hostPlatform != stdenv.buildPlatform; in { + outputs = [ + "out" + "man" + ]; src = if overrideSrc != { } then overrideSrc diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 59e7dd7fa5d5..f7b96b1c1b95 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -79,7 +79,7 @@ let pythonEnv = unwrapped.python.withPackages (ps: pythonPkgs); pname = unwrapped.pname + "-wrapped"; - inherit (unwrapped) version; + inherit (unwrapped) outputs version; makeWrapperArgs = builtins.concatStringsSep " " ( [ ] @@ -214,15 +214,21 @@ let self = if doWrap then stdenv.mkDerivation { - inherit pname version passthru; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ + inherit + pname + outputs + version + passthru + ; + nativeBuildInputs = [ + makeWrapper xorg.lndir ]; buildCommand = '' mkdir $out cd $out - lndir -silent ${unwrapped} + lndir -silent ${unwrapped.out} + lndir -silent ${unwrapped.man} ${lib.optionalString (extraPackages != [ ]) ( builtins.concatStringsSep "\n" ( map (pkg: ''