Merge pull request #138307 from Mindavi/squeekboard/fix-rust-1.54

This commit is contained in:
Artturi 2021-09-18 02:38:59 +03:00 committed by GitHub
commit 144f49f0bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -14,6 +14,7 @@
, rustPlatform
, feedbackd
, wrapGAppsHook
, fetchpatch
}:
stdenv.mkDerivation rec {
@ -37,6 +38,15 @@ stdenv.mkDerivation rec {
sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn";
};
patches = [
# remove when updating from 1.14.0
(fetchpatch {
name = "fix-rust-1.54-build.patch";
url = "https://gitlab.gnome.org/World/Phosh/squeekboard/-/commit/9cd56185c59ace535a6af26384ef6beca4423816.patch";
sha256 = "sha256-8rWcfhQmGiwlc2lpkRvJ95XQp1Xg7St+0K85x8nQ0mk=";
})
];
nativeBuildInputs = [
meson
ninja