Unverified Commit 5d67039b authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #219498 from Alper-Celik/master 

plasma-desktop: fix opening orca screen reader settings from kde systemsettings and kcmshell5 in kcm_access kcm
parents 65702964 3c7b83c7

pkgs/desktops/plasma-5/plasma-desktop/default.nix

+16 −3
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ 
, plasma-workspace

, qqc2-desktop-style

, xf86inputlibinput

, glib

, gsettings-desktop-schemas

, runCommandLocal

, makeWrapper

}:



mkDerivation {
@@ -115,9 +119,18 @@ mkDerivation { 
  patches = [

    ./hwclock-path.patch

    ./tzdir.patch

    ./kcm-access.patch

  ];

  CXXFLAGS = [

    ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"''

  CXXFLAGS =

    let

      # run gsettings with desktop schemas for using in kcm_accces kcm

      gsettings-wrapper = runCommandLocal "gsettings-wrapper" { nativeBuildInputs = [ makeWrapper ]; } ''

        makeWrapper ${glib}/bin/gsettings $out --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas.out}/share/gsettings-schemas/${gsettings-desktop-schemas.name}

      '';

    in

    [

      ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/bin/hwclock\"''

      ''-DNIXPKGS_GSETTINGS=\"${gsettings-wrapper}\"''

    ];

  postInstall = ''

    # Display ~/Desktop contents on the desktop by default.

pkgs/desktops/plasma-5/plasma-desktop/kcm-access.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/kcms/access/kcmaccess.cpp b/kcms/access/kcmaccess.cpp

index 4f8d3e2..a96f755 100644

--- a/kcms/access/kcmaccess.cpp

+++ b/kcms/access/kcmaccess.cpp

@@ -176,7 +176,7 @@ void KAccessConfig::launchOrcaConfiguration()

                                       QStringLiteral("screen-reader-enabled"),

                                       QStringLiteral("true")};

 

-    int ret = QProcess::execute(QStringLiteral("gsettings"), gsettingArgs);

+    int ret = QProcess::execute(QStringLiteral(NIXPKGS_GSETTINGS), gsettingArgs);

     if (ret) {

         const QString errorStr = QLatin1String("gsettings ") + gsettingArgs.join(QLatin1Char(' '));

         setOrcaLaunchFeedback(i18n("Could not set gsettings for Orca: \"%1\" failed", errorStr));