From 09fd4270d7cc8f1ea408d40a37e79f57dcb2eb3a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 30 Oct 2020 20:39:19 +0200 Subject: [PATCH] kile: some slight improvements/fixes Use `buildInputs` instead of `propagatedBuildInputs` - should reduce closure size a bit. Don't wrap executables twice. Move `kdoctools` to native. Use libsForQt5 - default version (works). Co-authored-by: Frederik Rietdijk --- pkgs/applications/editors/kile/default.nix | 13 ++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 1f1e43d196c..6819c4337f4 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -29,14 +29,17 @@ mkDerivation rec { sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; }; - nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; + nativeBuildInputs = [ + extra-cmake-modules + wrapGAppsHook + kdoctools + ]; - propagatedBuildInputs = [ + buildInputs = [ kconfig kcrash kdbusaddons kdelibs4support - kdoctools kguiaddons kiconthemes kinit @@ -48,6 +51,10 @@ mkDerivation rec { poppler qtscript ]; + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; propagatedUserEnvPkgs = [ konsole ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a0f316b1b..554847673eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21778,7 +21778,7 @@ in kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; - kile = libsForQt514.callPackage ../applications/editors/kile { }; + kile = libsForQt5.callPackage ../applications/editors/kile { }; kino = callPackage ../applications/video/kino { inherit (gnome2) libglade;