diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-10-30 20:39:19 +0200 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2020-10-30 20:39:19 +0200 |
| commit | 09fd4270d7cc8f1ea408d40a37e79f57dcb2eb3a (patch) | |
| tree | 534b0ae6f37ccf08a22e9f538c1dde6245f6023f | |
| parent | 77e081bb2b82a412b901abffb347ca4eb2e75eec (diff) | |
| download | nixpkgs-09fd4270d7cc8f1ea408d40a37e79f57dcb2eb3a.tar nixpkgs-09fd4270d7cc8f1ea408d40a37e79f57dcb2eb3a.tar.gz nixpkgs-09fd4270d7cc8f1ea408d40a37e79f57dcb2eb3a.tar.bz2 nixpkgs-09fd4270d7cc8f1ea408d40a37e79f57dcb2eb3a.tar.lz nixpkgs-09fd4270d7cc8f1ea408d40a37e79f57dcb2eb3a.tar.xz nixpkgs-09fd4270d7cc8f1ea408d40a37e79f57dcb2eb3a.tar.zst nixpkgs-09fd4270d7cc8f1ea408d40a37e79f57dcb2eb3a.zip | |
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 <fridh@fridh.nl>
| -rw-r--r-- | pkgs/applications/editors/kile/default.nix | 13 | ||||
| -rw-r--r-- | 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; |