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
This commit is contained in:
parent
d411c1a3d3
commit
bde17935d4
@ -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 = ''
|
||||
|
Loading…
Reference in New Issue
Block a user