Skip to content

[20.09] kdeApplications: Use latest qt515 by default #102347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FRidh merged 9 commits into from
Nov 3, 2020
Merged

[20.09] kdeApplications: Use latest qt515 by default #102347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cda9f4c
kdeApplications: Use latest qt515 by default
doronbehar Oct 22, 2020
9ec7313
kdeconnect: avoid double-wrapping the binary
peterhoeg Oct 28, 2020
c77ffd2
kdeApplications: 20.08.1 -> 20.08.2
peterhoeg Oct 28, 2020
abf618a
okular: add missing dependency
peterhoeg Oct 28, 2020
6dfa894
zanshin: broken before the 20.08.2 upgrade
peterhoeg Oct 28, 2020
08f7826
kdenlive: avoid double wrapping
FRidh Nov 1, 2020
32c452b
kdenlive: depend on qtmultimedia instead of unsupported qtwebkit
FRidh Nov 1, 2020
0c7d136
libsForQt515.mlt: is not broken
FRidh Nov 1, 2020
7abe15c
digikam: fix double wrapping
FRidh Nov 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/plasma5.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ in

security.wrappers = {
kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/libexec/kcheckpass";
start_kdeinit.source = "${lib.getBin pkgs.kinit}/libexec/kf5/start_kdeinit";
start_kdeinit.source = "${lib.getBin pkgs.kdeFrameworks.kinit}/libexec/kf5/start_kdeinit";
kwin_wayland = {
source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
capabilities = "cap_sys_nice+ep";
Expand Down
7 changes: 6 additions & 1 deletion nixos/modules/services/x11/display-managers/sddm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ let
cfg = dmcfg.sddm;
xEnv = config.systemd.services.display-manager.environment;

inherit (pkgs) sddm;
sddm = if config.services.xserver.desktopManager.lxqt.enable then
# TODO: Move lxqt to libsForQt515
pkgs.libsForQt514.sddm
else
pkgs.libsForQt5.sddm
;

xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh
Expand Down
13 changes: 10 additions & 3 deletions pkgs/applications/editors/kile/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -48,6 +51,10 @@ mkDerivation rec {
poppler
qtscript
];
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';

propagatedUserEnvPkgs = [ konsole ];

Expand Down
7 changes: 5 additions & 2 deletions pkgs/applications/graphics/digikam/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,12 @@ mkDerivation rec {
"-DENABLE_QWEBENGINE=on"
];

dontWrapGApps = true;

preFixup = ''
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
gappsWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname})
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname})
substituteInPlace $out/bin/digitaglinktree \
--replace "/usr/bin/perl" "${perl}/bin/perl" \
--replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
Expand Down
Loading