diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-07 12:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 12:01:24 +0000 |
| commit | 860e5725bdfc7307b8257cbf9bf4a87dec978cc8 (patch) | |
| tree | e410fc29c9dff2d52e1ee6a12f8394b0507bd96b /pkgs/desktops | |
| parent | 32d842483f3773ec1cde181507bd77b405af046e (diff) | |
| parent | 4a609ec5d195ed770a1b30fa49ba19a0947cd819 (diff) | |
| download | nixlib-860e5725bdfc7307b8257cbf9bf4a87dec978cc8.tar nixlib-860e5725bdfc7307b8257cbf9bf4a87dec978cc8.tar.gz nixlib-860e5725bdfc7307b8257cbf9bf4a87dec978cc8.tar.bz2 nixlib-860e5725bdfc7307b8257cbf9bf4a87dec978cc8.tar.lz nixlib-860e5725bdfc7307b8257cbf9bf4a87dec978cc8.tar.xz nixlib-860e5725bdfc7307b8257cbf9bf4a87dec978cc8.tar.zst nixlib-860e5725bdfc7307b8257cbf9bf4a87dec978cc8.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/extensions/extensionOverrides.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index b3718cbd17f3..abbeb15f7dcd 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -49,6 +49,7 @@ super: lib.trivial.pipe super [ nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; buildInputs = [ vte ]; postFixup = '' + substituteInPlace "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm" --replace "gjs" "${gjs}/bin/gjs" wrapGApp "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm" ''; })) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 3c9fc107a978..5aff02f08170 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -29,6 +30,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-MJybc2yAchU6qMqkoRz45QdhR7bj/UFk2nyxcBivsHI="; }; + patches = [ + # Add support for AppStream 1.0 + # https://github.com/elementary/switchboard-plug-about/pull/275 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/72d7da13da2824812908276751fd3024db2dd0f8.patch"; + hash = "sha256-R7oW3mL77/JNqxuMiqxtdMlHWMJgGRQBBzVeRiqx8PY="; + }) + ]; + nativeBuildInputs = [ meson ninja |