From c78768e154c880add599fe81fc71598b4a40f268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 8 Nov 2025 23:42:09 +0100 Subject: [PATCH] qgis: add man output --- pkgs/applications/gis/qgis/default.nix | 8 ++++---- pkgs/applications/gis/qgis/unwrapped.nix | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 74d5d6f732ce..fffd5ddd398d 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/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 = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index c102d9c23356..972e647da523 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -84,6 +84,10 @@ in mkDerivation rec { version = "3.44.3"; pname = "qgis-unwrapped"; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "qgis"; @@ -180,7 +184,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.