Skip to content
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

gnome.gnome-settings-daemon338: fix build with meson 0.61 #164266

Merged
merged 1 commit into from
Mar 17, 2022
Merged

gnome.gnome-settings-daemon338: fix build with meson 0.61 #164266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib, stdenv
{ stdenv
, lib
, fetchpatch
, substituteAll
, fetchurl
Expand Down Expand Up @@ -70,6 +71,14 @@ stdenv.mkDerivation rec {
})

# Fix build with new meson
# plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments.
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch";
sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ=";
})
# meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff";
sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY=";
Expand Down