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

authored by Artturi and committed by GitHub 144f49f0 d5069c92

+10
+10
pkgs/applications/accessibility/squeekboard/default.nix
··· 14 , rustPlatform 15 , feedbackd 16 , wrapGAppsHook 17 }: 18 19 stdenv.mkDerivation rec { ··· 36 name = "${pname}-${version}"; 37 sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn"; 38 }; 39 40 nativeBuildInputs = [ 41 meson
··· 14 , rustPlatform 15 , feedbackd 16 , wrapGAppsHook 17 + , fetchpatch 18 }: 19 20 stdenv.mkDerivation rec { ··· 37 name = "${pname}-${version}"; 38 sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn"; 39 }; 40 + 41 + patches = [ 42 + # remove when updating from 1.14.0 43 + (fetchpatch { 44 + name = "fix-rust-1.54-build.patch"; 45 + url = "https://gitlab.gnome.org/World/Phosh/squeekboard/-/commit/9cd56185c59ace535a6af26384ef6beca4423816.patch"; 46 + sha256 = "sha256-8rWcfhQmGiwlc2lpkRvJ95XQp1Xg7St+0K85x8nQ0mk="; 47 + }) 48 + ]; 49 50 nativeBuildInputs = [ 51 meson