Revert "kdePackages.extra-cmake-modules: propagate qdoc by default" (3f200cf2) · Commits · nix / nixpkgs

pkgs/by-name/di/digikam/package.nix

+0 −5

Original line number	Diff line number	Diff line
		@@ -94,11 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
		bison
		kdePackages.wrapQtAppsHook
		wrapGAppsHook3

		kdePackages.qtmultimedia
		kdePackages.qtnetworkauth
		kdePackages.qtscxml
		kdePackages.qtwebengine
		];

		# Based on <https://www.digikam.org/api/index.html#externaldeps>,

+2 −6

Original line number	Diff line number	Diff line
		{
		mkKdeDerivation,
		python3,
		qttools,
		}:
		mkKdeDerivation {
		pname = "extra-cmake-modules";
		@@ -12,13 +11,10 @@ mkKdeDerivation {

		outputs = [ "out" ];

		propagatedNativeBuildInputs = [
		# Packages that have an Android APK (e.g. KWeather) require Python3 at build time.
		# See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57
		propagatedNativeBuildInputs = [
		python3

		# Most packages require QDoc to generate docs, even if they're not installed
		(qttools.override { withClang = true; })
		];

		setupHook = ./ecm-hook.sh;

+5 −1

Original line number	Diff line number	Diff line
		{
		mkKdeDerivation,
		qttools,
		pkg-config,
		xz,
		}:
		mkKdeDerivation {
		pname = "karchive";

		extraNativeBuildInputs = [ pkg-config ];
		extraNativeBuildInputs = [
		qttools
		pkg-config
		];
		extraBuildInputs = [ xz ];
		}

+6 −1

Original line number	Diff line number	Diff line
		{ mkKdeDerivation }:
		{
		mkKdeDerivation,
		qttools,
		}:
		mkKdeDerivation {
		pname = "kauth";

		# Late resolve paths so things end up in their own prefix
		# FIXME(later): discuss with upstream
		patches = [ ./fix-paths.patch ];

		extraNativeBuildInputs = [ qttools ];
		}

+6 −1

Original line number	Diff line number	Diff line
		{ mkKdeDerivation }:
		{
		mkKdeDerivation,
		qttools,
		}:
		mkKdeDerivation {
		pname = "kbookmarks";

		extraNativeBuildInputs = [ qttools ];
		}