diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-13 12:03:59 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-01-13 18:37:05 +0800 |
| commit | d411c1a3d3425e9739ea47f6d52a2f3b5f5d2827 (patch) | |
| tree | 30df235501d28570d9f3c813ebe8ff3ab03117c1 | |
| parent | e941b7465bba921d663879713d8da995f82fa3e8 (diff) | |
| download | nixpkgs-d411c1a3d3425e9739ea47f6d52a2f3b5f5d2827.tar nixpkgs-d411c1a3d3425e9739ea47f6d52a2f3b5f5d2827.tar.gz nixpkgs-d411c1a3d3425e9739ea47f6d52a2f3b5f5d2827.tar.bz2 nixpkgs-d411c1a3d3425e9739ea47f6d52a2f3b5f5d2827.tar.lz nixpkgs-d411c1a3d3425e9739ea47f6d52a2f3b5f5d2827.tar.xz nixpkgs-d411c1a3d3425e9739ea47f6d52a2f3b5f5d2827.tar.zst nixpkgs-d411c1a3d3425e9739ea47f6d52a2f3b5f5d2827.zip | |
pantheon.elementary-code: 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
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-code/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index f83839f6c92..5007e297267 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -38,6 +39,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw="; }; + patches = [ + # Fix build with meson 0.61 + # https://github.com/elementary/code/pull/1165 + (fetchpatch { + url = "https://github.com/elementary/code/commit/a2607cce3a6b1bb62d02456456d3cbc3c6530bb0.patch"; + sha256 = "sha256-VKR83IOUYsQhBRlU9JUTlMJtXWv/AyG4wDsjMU2vmU8="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; |