diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-11-14 09:26:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-14 09:26:53 -0500 |
| commit | acf9bb5cb272b631d9dfb8664ece0733e3c1b31e (patch) | |
| tree | 6a670481f8feba19168f73895c4aeeaa3599992a /pkgs | |
| parent | 3461a8c9bd7276825b74236885ee6a7fa889d172 (diff) | |
| parent | 7cf253947209a5c5306e30ede2d24fdc1d0d3a5a (diff) | |
| download | nixpkgs-acf9bb5cb272b631d9dfb8664ece0733e3c1b31e.tar nixpkgs-acf9bb5cb272b631d9dfb8664ece0733e3c1b31e.tar.gz nixpkgs-acf9bb5cb272b631d9dfb8664ece0733e3c1b31e.tar.bz2 nixpkgs-acf9bb5cb272b631d9dfb8664ece0733e3c1b31e.tar.lz nixpkgs-acf9bb5cb272b631d9dfb8664ece0733e3c1b31e.tar.xz nixpkgs-acf9bb5cb272b631d9dfb8664ece0733e3c1b31e.tar.zst nixpkgs-acf9bb5cb272b631d9dfb8664ece0733e3c1b31e.zip | |
Merge pull request #267432 from oxalica/fix/qtwayland-freeze
qt6Packages.qtwayland: fix a freezing bug with fcitx5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtwayland.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index ddd402f3c22..94f3b80e9c3 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -1,10 +1,10 @@ { qtModule , qtbase -, qtquick3d , qtdeclarative , wayland , pkg-config , libdrm +, fetchpatch }: qtModule { @@ -12,4 +12,12 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; + patches = [ + # Fix a freezing bug with fcitx5. + # https://codereview.qt-project.org/c/qt/qtwayland/+/517601 + (fetchpatch { + url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=6fe83f6076423068b652fa4fcb0b5adbd297f2a8"; + hash = "sha256-TlZozKezpYm90B9qFP9qv76asRdIt+5bq9E3GcmFiDc="; + }) + ]; } |