Merge pull request #138307 from Mindavi/squeekboard/fix-rust-1.54
This commit is contained in:
commit
144f49f0bf
|
@ -14,6 +14,7 @@
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, feedbackd
|
, feedbackd
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
|
, fetchpatch
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -37,6 +38,15 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn";
|
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 = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
|
|
Loading…
Reference in a new issue