pyrox.dev
Merge pull request #243088 from Alper-Celik/kde-accessibility-fix
plasma-desktop: add missing gsettings schemas on kaccess
+12
-8
pkgs/desktops/plasma-5/plasma-desktop/default.nix
+12
-8
pkgs/desktops/plasma-5/plasma-desktop/default.nix
···
58
58
, runCommandLocal
59
59
, makeWrapper
60
60
}:
61
-
61
+
let
62
+
# run gsettings with desktop schemas for using in "kcm_access" kcm
63
+
# and in kaccess
64
+
gsettings-wrapper = runCommandLocal "gsettings-wrapper" { nativeBuildInputs = [ makeWrapper ]; } ''
65
+
mkdir -p $out/bin
66
+
makeWrapper ${glib}/bin/gsettings $out/bin/gsettings --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas.out}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
67
+
'';
68
+
in
62
69
mkDerivation {
63
70
pname = "plasma-desktop";
64
71
nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ];
···
122
129
./kcm-access.patch
123
130
];
124
131
CXXFLAGS =
125
-
let
126
-
# run gsettings with desktop schemas for using in kcm_accces kcm
127
-
gsettings-wrapper = runCommandLocal "gsettings-wrapper" { nativeBuildInputs = [ makeWrapper ]; } ''
128
-
makeWrapper ${glib}/bin/gsettings $out --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas.out}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
129
-
'';
130
-
in
131
132
[
132
133
''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/bin/hwclock\"''
133
-
''-DNIXPKGS_GSETTINGS=\"${gsettings-wrapper}\"''
134
+
''-DNIXPKGS_GSETTINGS=\"${gsettings-wrapper}/bin/gsettings\"''
134
135
];
135
136
postInstall = ''
136
137
# Display ~/Desktop contents on the desktop by default.
137
138
sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \
138
139
-e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/'
139
140
'';
141
+
142
+
# wrap kaccess with wrapped gsettings so it can access accessibility schemas
143
+
qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ gsettings-wrapper ]}" ];
140
144
}