diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-03-20 15:17:43 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-20 15:17:43 -0300 |
| commit | 7e1810ceb2ccadb72fa03eff69d89e682d7207a7 (patch) | |
| tree | 217295c2443dbc97db5a3c8d41daf61c6d2ef383 | |
| parent | 1d512e6283f4ec753a4e6be7cbd50ffd503d7e5f (diff) | |
| parent | c4c64b6a324fe5c73b6b8b57ef86c2ff12eacb4b (diff) | |
| download | nixpkgs-7e1810ceb2ccadb72fa03eff69d89e682d7207a7.tar nixpkgs-7e1810ceb2ccadb72fa03eff69d89e682d7207a7.tar.gz nixpkgs-7e1810ceb2ccadb72fa03eff69d89e682d7207a7.tar.bz2 nixpkgs-7e1810ceb2ccadb72fa03eff69d89e682d7207a7.tar.lz nixpkgs-7e1810ceb2ccadb72fa03eff69d89e682d7207a7.tar.xz nixpkgs-7e1810ceb2ccadb72fa03eff69d89e682d7207a7.tar.zst nixpkgs-7e1810ceb2ccadb72fa03eff69d89e682d7207a7.zip | |
Merge pull request #164948 from trofi/fix-meld-for-meson-0.60
meld: pull upstream fix for meson-0.60
| -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 |