diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-11-01 11:05:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-01 11:05:05 +0100 |
commit | 54f7498601dcfc884c42a6d29f15475e6e1a802b (patch) | |
tree | 63d16380d8c85f69a08289df307af7d62ea7fc08 /pkgs/applications | |
parent | 93e0a06de4eac37fd7cc9703851224e47ce677b6 (diff) | |
parent | 35078d9918d3c628fa136a2845b8561535ba09eb (diff) | |
download | nixpkgs-54f7498601dcfc884c42a6d29f15475e6e1a802b.tar nixpkgs-54f7498601dcfc884c42a6d29f15475e6e1a802b.tar.gz nixpkgs-54f7498601dcfc884c42a6d29f15475e6e1a802b.tar.bz2 nixpkgs-54f7498601dcfc884c42a6d29f15475e6e1a802b.tar.lz nixpkgs-54f7498601dcfc884c42a6d29f15475e6e1a802b.tar.xz nixpkgs-54f7498601dcfc884c42a6d29f15475e6e1a802b.tar.zst nixpkgs-54f7498601dcfc884c42a6d29f15475e6e1a802b.zip |
Merge pull request #101369 from doronbehar/pkg/kdeApplications/qt515
kdeApplications: Use latest qt515 by default
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/kile/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/misc/tellico/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 |
3 files changed, 14 insertions, 7 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/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index 6425be00418..fa725ad9c96 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -1,7 +1,7 @@ { lib , fetchurl , mkDerivation -, kdeApplications +, libkcddb , kinit , kdelibs4support , solid @@ -46,7 +46,7 @@ mkDerivation rec { exempi extra-cmake-modules karchive - kdeApplications.libkcddb + libkcddb kdelibs4support kfilemetadata khtml diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 9c8625495b2..cc6cc72e27b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ , flashplayer, hal-flash , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd , gnome3/*.gnome-shell*/ -, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow +, browserpass, chrome-gnome-shell, uget-integrator, plasma5, bukubrow , tridactyl-native , fx_cast_bridge , udev @@ -65,7 +65,7 @@ let ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator - ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration + ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5.plasma-browser-integration ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); |