Unverified Commit 0092a9a7 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents cb3a025e 5d67039b
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@

stdenv.mkDerivation rec {
  pname = "cemu";
  version = "2.0-28";
  version = "2.0-32";

  src = fetchFromGitHub {
    owner = "cemu-project";
    repo = "Cemu";
    rev = "v${version}";
    hash = "sha256-qKrj3XPtFVy0/KH18D0oCeVUQQmIdkYJYrCKD82c/+s=";
    hash = "sha256-47uCGN1wFVx3ph/q3+BG+pwJ7nisbmRPUEatOIq0i9M=";
  };

  patches = [
+4 −1
Original line number Diff line number Diff line
{ lib, stdenv, appimageTools, fetchurl, undmg }:
{ lib, stdenv, appimageTools, fetchurl, makeWrapper, undmg }:

let
  pname = "joplin-desktop";
@@ -51,6 +51,9 @@ let
    extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
    extraInstallCommands = ''
      mv $out/bin/{${name},${pname}}
      source "${makeWrapper}/nix-support/setup-hook"
      wrapProgram $out/bin/${pname} \
        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"
      install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications
      install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps
      substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \
+27 −27
Original line number Diff line number Diff line
@@ -101,38 +101,38 @@
    "vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw="
  },
  "aviatrix": {
    "hash": "sha256-dWG5qJtolzEKXgDy0LG68DHaVe02LqePKfBQFS2QoBk=",
    "hash": "sha256-gEIfDiI0ZVTVwijY+rc5nL8fKptSlUocx2lS8pT1Xjg=",
    "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix",
    "owner": "AviatrixSystems",
    "repo": "terraform-provider-aviatrix",
    "rev": "v3.0.3",
    "rev": "v3.0.4",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
  "aws": {
    "hash": "sha256-vV1I9hQOil1ume9+GV14fBVo6NaBZlElemhFhnQ7rl4=",
    "hash": "sha256-XCGMoa/x8hkf+7gL0qYBX7jMx4wnMXxpyx/wH9ff+m4=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
    "owner": "hashicorp",
    "repo": "terraform-provider-aws",
    "rev": "v4.62.0",
    "rev": "v4.63.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-2OmadSxpr3buMukM25mb/xXnI5rVkIuX0sbbI0zqRYE="
    "vendorHash": "sha256-t6Hg1FLCd4dh6d3J0uNsNKKnz5T8/yoIXFo7bRO+XHM="
  },
  "azuread": {
    "hash": "sha256-MGCGfocs16qmJnvMRRD7TRHnPkS17h+oNUkMARAQhLs=",
    "hash": "sha256-GhdBZv78LuspLfKwGD7uBIQ08bnE4NLUgPwWvZcVowo=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
    "owner": "hashicorp",
    "repo": "terraform-provider-azuread",
    "rev": "v2.36.0",
    "rev": "v2.37.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
  "azurerm": {
    "hash": "sha256-NffjRiJz92MwTo6K0H2nuqcfdvmhj9i8Xre0T7gaPeA=",
    "hash": "sha256-MSglw8EylPaAoMFz3S7pUeedNROeNAPTSXWN+NiIXN8=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
    "owner": "hashicorp",
    "repo": "terraform-provider-azurerm",
    "rev": "v3.51.0",
    "rev": "v3.52.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -327,11 +327,11 @@
    "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk="
  },
  "dnsimple": {
    "hash": "sha256-40ueiX2LrtTyiMgCgHRq07hMYrLKh6N+7wfrXr+MC7w=",
    "hash": "sha256-d3kbHf17dBnQC5FOCcqGeZ/6+qV1pxvEJ9IZwXoodFc=",
    "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
    "owner": "dnsimple",
    "repo": "terraform-provider-dnsimple",
    "rev": "v0.17.0",
    "rev": "v1.0.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-LXRNq5nxoZ6xZdKioT6cjyLaYChRAN28PzKsJ5BRako="
  },
@@ -466,11 +466,11 @@
    "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
  },
  "grafana": {
    "hash": "sha256-7WonpFvk9jKPUGRanCmo5H6L01rDBuZN4DGjdaQaBq4=",
    "hash": "sha256-SZ5mHUW6bZyDbZ865PYMgTFyvxudxw9pfpO/cdXDF8o=",
    "homepage": "https://registry.terraform.io/providers/grafana/grafana",
    "owner": "grafana",
    "repo": "terraform-provider-grafana",
    "rev": "v1.37.0",
    "rev": "v1.37.1",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-Mv3BKYS1j5AAHbXVCP5C3OQpEmOBea2ru3ONbJ0pYyc="
  },
@@ -584,11 +584,11 @@
    "vendorHash": null
  },
  "infoblox": {
    "hash": "sha256-bLZK2lZqnpiE5vsJAAiGw4BrBzVWGyg5VZq/Ngr8VlA=",
    "hash": "sha256-C7j9WvhLePQvZlGvYC51GQRIa5JwgARNDG1nGZwY6FU=",
    "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox",
    "owner": "infobloxopen",
    "repo": "terraform-provider-infoblox",
    "rev": "v2.2.0",
    "rev": "v2.3.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -728,13 +728,13 @@
    "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
  },
  "minio": {
    "hash": "sha256-eF3yT3cI+ODGN4nqf9rTy3PUev09KMGgzvaa4znPIm4=",
    "hash": "sha256-URn6XFqKTE3nXE5ZcaXmRvGl6qLdffLLSoMRq70zh4I=",
    "homepage": "https://registry.terraform.io/providers/aminueza/minio",
    "owner": "aminueza",
    "repo": "terraform-provider-minio",
    "rev": "v1.13.0",
    "rev": "v1.14.0",
    "spdx": "Apache-2.0",
    "vendorHash": "sha256-Tps4SoiSmGwPWZgf2Q1MilpLhKnB/TCFe35Hb4DfwaU="
    "vendorHash": "sha256-Mdy9uXYb7MH9XHqSNkG0QqTVzjvTy4+/Mr6VHXJBEZE="
  },
  "mongodbatlas": {
    "hash": "sha256-Ek7dIKWlyyAoEoMMTHx3DOBNuCoOtXP0CJHAsC04xy0=",
@@ -882,11 +882,11 @@
    "vendorHash": null
  },
  "pagerduty": {
    "hash": "sha256-ZjqxXsLHmTbQp5QVsQN6Wj6ff7dOKceuMWsQ9SXSNPE=",
    "hash": "sha256-roreCock+WDBNw/v3/esVVntF7cZmEnDW5sZ4GMmQbs=",
    "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
    "owner": "PagerDuty",
    "repo": "terraform-provider-pagerduty",
    "rev": "v2.13.0",
    "rev": "v2.14.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -1044,13 +1044,13 @@
    "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
  },
  "spotinst": {
    "hash": "sha256-g/kELVG+hsR+RynLfyB0MQkjC7eUeUUVn/h7S/MABXU=",
    "hash": "sha256-+vETa0dX9iHgif8Q0dePEQp0JK9XJ+ACEyrR7LlSJT8=",
    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
    "owner": "spotinst",
    "repo": "terraform-provider-spotinst",
    "rev": "v1.110.0",
    "rev": "v1.112.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-2HApI9Cw63zxzgSP9Xe6xAcqHDx8KSlRiIh+IVSEUfo="
    "vendorHash": "sha256-HX9UrtefNIVfsREJq6NiV4Zy/PjweQXmVP6HFygwX7s="
  },
  "stackpath": {
    "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
@@ -1116,11 +1116,11 @@
    "vendorHash": "sha256-plYy3INLi/SeKu7R0lDLY1CvRDU7bmZsQKzFtMc2Wu4="
  },
  "thunder": {
    "hash": "sha256-GmFEgEKpkx+cvztHe2qDTVStMIGYYzmbZM8/QmSwbcA=",
    "hash": "sha256-amGtmE1i68K0ehhYBJ6wwcdUPuVGSWoVdYAb1PwhlAs=",
    "homepage": "https://registry.terraform.io/providers/a10networks/thunder",
    "owner": "a10networks",
    "repo": "terraform-provider-thunder",
    "rev": "v1.2.0",
    "rev": "v1.2.1",
    "spdx": "BSD-2-Clause",
    "vendorHash": null
  },
@@ -1235,11 +1235,11 @@
    "vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI="
  },
  "vultr": {
    "hash": "sha256-fEeKvV2t38gD5SLYAgEOJJSPjTcIhCtIYmOYMFiwcYg=",
    "hash": "sha256-cHMD4/jlXTIQ9ppTFJsUTHVQ3R9Qoe0I3me7zz2bxus=",
    "homepage": "https://registry.terraform.io/providers/vultr/vultr",
    "owner": "vultr",
    "repo": "terraform-provider-vultr",
    "rev": "v2.13.0",
    "rev": "v2.14.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
+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.
+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));
Loading