diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-28 18:01:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-28 18:01:16 +0000 |
commit | 6fcda9f1ec27db14412a2103281b4b14f806066a (patch) | |
tree | 10d6f3aa9b4fc34ca27e907a5a7d199e6fca15b2 /pkgs/development/libraries/qt-5/modules/qtwebengine.nix | |
parent | a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243 (diff) | |
parent | 4ecfa58c97863796f407b823049bcf1bd1866aac (diff) | |
download | nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar.gz nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar.bz2 nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar.lz nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar.xz nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.tar.zst nixpkgs-6fcda9f1ec27db14412a2103281b4b14f806066a.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules/qtwebengine.nix')
-rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 729c5f388f9..8d1eae71276 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -166,7 +166,7 @@ qtModule { # X11 libs xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst - xorg.libXcomposite xorg.libXdamage libdrm + xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile ] ++ optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [ # Pipewire |