From bde17935d4352d5c203746d71fc0ce5fcdcdd88c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 13 Jan 2022 12:08:32 +0800 Subject: [PATCH] pantheon.elementary-greeter: pull upstream fix for meson 0.61 i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61 --- .../pantheon/desktop/elementary-greeter/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 25bce374c23c..72df609c5a47 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , linkFarm , substituteAll @@ -90,6 +91,12 @@ stdenv.mkDerivation rec { src = ./hardcode-fallback-background.patch; default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; }) + # Fix build with meson 0.61 + # https://github.com/elementary/greeter/pull/590 + (fetchpatch { + url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch"; + sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY="; + }) ]; preFixup = ''