diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-13 12:10:40 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-01-13 18:37:14 +0800 |
| commit | 990d558faf89caccc9ea441b58fe07e0187fb559 (patch) | |
| tree | 68317294003ebcdf8f3a7c5027a20275aba154a8 | |
| parent | bde17935d4352d5c203746d71fc0ce5fcdcdd88c (diff) | |
| download | nixpkgs-990d558faf89caccc9ea441b58fe07e0187fb559.tar nixpkgs-990d558faf89caccc9ea441b58fe07e0187fb559.tar.gz nixpkgs-990d558faf89caccc9ea441b58fe07e0187fb559.tar.bz2 nixpkgs-990d558faf89caccc9ea441b58fe07e0187fb559.tar.lz nixpkgs-990d558faf89caccc9ea441b58fe07e0187fb559.tar.xz nixpkgs-990d558faf89caccc9ea441b58fe07e0187fb559.tar.zst nixpkgs-990d558faf89caccc9ea441b58fe07e0187fb559.zip | |
pantheon.switchboard: 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/switchboard/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index c8e6f11f111..50a3317d6e0 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch"; sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc"; }) + # Fix build with meson 0.61 + # https://github.com/elementary/switchboard/pull/226 + (fetchpatch { + url = "https://github.com/elementary/switchboard/commit/ecf2a6c42122946cc84150f6927ef69c1f67c909.patch"; + sha256 = "sha256-J62tMeDfOpliBLHMSa3uBGTc0RBNzC6eDjDBDYySL+0="; + }) ]; postPatch = '' |