BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pantheon.elementary-files: pull upstream fix for meson 0.61

Browse source 
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:
Bobby Rong 2022-01-13 13:33:28 +08:00
parent 76a8c87e13
commit fcbcf3e49a
No known key found for this signature in database
GPG key ID: ED07364437C91161
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, nix-update-script , nix-update-script
, pkg-config , pkg-config
, meson , meson
@ -43,6 +44,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY="; sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY=";
}; };
patches = [
# Fix build with meson 0.61
# https://github.com/elementary/files/pull/1973
(fetchpatch {
url = "https://github.com/elementary/files/commit/28428fbda905ece59d3427a3a40e986fdf71a916.patch";
sha256 = "sha256-GZTHAH9scQWrBqdrDI14cj57f61HD8o79zFcPCXjKmc=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
gettext gettext