assorted UI applications: add man output (#459890) (f09e2335) · Commits · nix / nixpkgs

pkgs/applications/gis/qgis/default.nix

+4 −4

Original line number	Diff line number	Diff line
		@@ -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 = {

+5 −1

Original line number	Diff line number	Diff line
		@@ -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.

+4 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,10 @@ let
		cross = stdenv.hostPlatform != stdenv.buildPlatform;
		in
		{
		outputs = [
		"out"
		"man"
		];
		src =
		if overrideSrc != { } then
		overrideSrc

+11 −5

Original line number	Diff line number	Diff line
		@@ -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: ''

+1 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {

		outputs = [
		"out"
		"man"
		"tex"
		];