diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-13 14:06:04 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-01-13 18:37:26 +0800 |
| commit | d277f1354abf9d4d86c54f1c4caa61c78e0720a5 (patch) | |
| tree | 2da5b9cf077a755b91c2dd37e75dd82744558ac1 /pkgs/desktops/pantheon | |
| parent | fcbcf3e49ac526c582ace2e9ef7db12e7d12a442 (diff) | |
| download | nixpkgs-d277f1354abf9d4d86c54f1c4caa61c78e0720a5.tar nixpkgs-d277f1354abf9d4d86c54f1c4caa61c78e0720a5.tar.gz nixpkgs-d277f1354abf9d4d86c54f1c4caa61c78e0720a5.tar.bz2 nixpkgs-d277f1354abf9d4d86c54f1c4caa61c78e0720a5.tar.lz nixpkgs-d277f1354abf9d4d86c54f1c4caa61c78e0720a5.tar.xz nixpkgs-d277f1354abf9d4d86c54f1c4caa61c78e0720a5.tar.zst nixpkgs-d277f1354abf9d4d86c54f1c4caa61c78e0720a5.zip | |
pantheon.elementary-screenshot: 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
Diffstat (limited to 'pkgs/desktops/pantheon')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 176c2919be0..9e65a562875 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -28,6 +29,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-n+L08C/W5YnHZ5P3F1NGUYE2SH94sc4+kr1x+wXZ+cw="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/screenshot/pull/241 + (fetchpatch { + url = "https://github.com/elementary/screenshot/commit/80a5d942e813dd098e1ef0f6629b81d2ccef05ae.patch"; + sha256 = "sha256-jOQuzUJvsjqytplLcW9BeIxzi9+/k2GFa4hHVZ3+wts="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils meson |