diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-03-20 08:57:40 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-03-20 08:58:13 +0000 |
| commit | c4c64b6a324fe5c73b6b8b57ef86c2ff12eacb4b (patch) | |
| tree | 4e521e7de9aa9d2cc9f7a592c4d9b1be21cbb94f | |
| parent | 6a300e5a27c4cf57b4e322fa6bf7dbf885f52632 (diff) | |
| download | nixpkgs-c4c64b6a324fe5c73b6b8b57ef86c2ff12eacb4b.tar nixpkgs-c4c64b6a324fe5c73b6b8b57ef86c2ff12eacb4b.tar.gz nixpkgs-c4c64b6a324fe5c73b6b8b57ef86c2ff12eacb4b.tar.bz2 nixpkgs-c4c64b6a324fe5c73b6b8b57ef86c2ff12eacb4b.tar.lz nixpkgs-c4c64b6a324fe5c73b6b8b57ef86c2ff12eacb4b.tar.xz nixpkgs-c4c64b6a324fe5c73b6b8b57ef86c2ff12eacb4b.tar.zst nixpkgs-c4c64b6a324fe5c73b6b8b57ef86c2ff12eacb4b.zip | |
meld: pull upstream fix for meson-0.60
Without the change build fails as:
> data/meson.build:34:0: ERROR: Function does not take positional arguments.
| -rw-r--r-- | pkgs/applications/version-management/meld/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index bef284ea534..462744641e3 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,5 +1,6 @@ { lib , fetchurl +, fetchpatch , gettext , itstool , python3 @@ -27,6 +28,16 @@ python3.pkgs.buildPythonApplication rec { sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI="; }; + patches = [ + # Pull upstream fix for meson-0.60: + # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78 + (fetchpatch { + name = "meson-0.60.patch"; + url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch"; + sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ="; + }) + ]; + nativeBuildInputs = [ meson ninja |