assorted UI applications: add man output (#459890)

pkgs/applications/gis/qgis/default.nix

@@ -14,14 +14,12 @@
 }:
 let
   qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix {
-    withGrass = withGrass;
-    withServer = withServer;
-    withWebKit = withWebKit;
+    inherit withGrass withServer withWebKit;
   };
 in
 
 symlinkJoin {
-  inherit (qgis-unwrapped) version src;
+  inherit (qgis-unwrapped) version outputs src;
   pname = "qgis";
 
   paths = [ qgis-unwrapped ];
@@ -42,6 +40,8 @@ symlinkJoin {
         --prefix PATH : $program_PATH \
         --set PYTHONPATH $program_PYTHONPATH
     done
+
+    ln -s ${qgis-unwrapped.man} $man
   '';
 
   passthru = {

pkgs/applications/gis/qgis/unwrapped.nix

@@ -83,6 +83,10 @@ in
 mkDerivation rec {
   version = "3.44.4";
   pname = "qgis-unwrapped";
+  outputs = [
+    "out"
+    "man"
+  ];
 
   src = fetchFromGitHub {
     owner = "qgis";
@@ -181,7 +185,7 @@ mkDerivation rec {
   dontWrapGApps = true; # wrapper params passed below
 
   postFixup = lib.optionalString withGrass ''
-    # GRASS has to be availble on the command line even though we baked in
+    # GRASS has to be available on the command line even though we baked in
     # the path at build time using GRASS_PREFIX.
     # Using wrapGAppsHook also prevents file dialogs from crashing the program
     # on non-NixOS.

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

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: ''

pkgs/applications/science/math/R/default.nix

@@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [
     "out"
+    "man"
     "tex"
   ];
 

pkgs/development/python-modules/ipython/default.nix

@@ -37,6 +37,10 @@
 buildPythonPackage rec {
   pname = "ipython";
   version = "9.5.0";
+  outputs = [
+    "out"
+    "man"
+  ];
   pyproject = true;
 
   src = fetchPypi {

pkgs/development/r-modules/wrapper.nix

@@ -11,6 +11,11 @@ symlinkJoin {
   preferLocalBuild = true;
   allowSubstitutes = false;
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   buildInputs = [ R ] ++ recommendedPackages ++ packages;
   paths = [ R ];
 
@@ -24,6 +29,8 @@ symlinkJoin {
       makeWrapper "${R}/bin/$exe" "$out/bin/$exe" \
         --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
     done
+
+    ln -s ${R.man} $man
   '';
 
   # Make the list of recommended R packages accessible to other packages such as rpy2

pkgs/misc/lilypond/default.nix

@@ -45,6 +45,10 @@
 stdenv.mkDerivation rec {
   pname = "lilypond";
   version = "2.24.4";
+  outputs = [
+    "out"
+    "man"
+  ];
 
   src = fetchzip {
     url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";

pkgs/misc/lilypond/with-fonts.nix

@@ -7,7 +7,12 @@
 }:
 
 lib.appendToName "with-fonts" (symlinkJoin {
-  inherit (lilypond) meta name version;
+  inherit (lilypond)
+    pname
+    outputs
+    version
+    meta
+    ;
 
   paths = [ lilypond ] ++ openlilylib-fonts.all;
 
@@ -15,7 +20,9 @@ lib.appendToName "with-fonts" (symlinkJoin {
 
   postBuild = ''
     for p in $out/bin/*; do
-        wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}"
+      wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}"
     done
+
+    ln -s ${lilypond.man} $man
   '';
 })