diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-27 05:29:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-27 05:29:58 +0000 |
commit | 1b5df99e7aefbeb7e0566bf819f502908399488c (patch) | |
tree | dc0fb5f718afce596722da5d2b6a2dcb5d517349 /pkgs/servers/x11 | |
parent | a1f82db35130229f05203623dd6188c0b3ec4a53 (diff) | |
parent | d41a2e33989efbe3843a26b73d3c2d38ca048c1e (diff) | |
download | nixpkgs-1b5df99e7aefbeb7e0566bf819f502908399488c.tar nixpkgs-1b5df99e7aefbeb7e0566bf819f502908399488c.tar.gz nixpkgs-1b5df99e7aefbeb7e0566bf819f502908399488c.tar.bz2 nixpkgs-1b5df99e7aefbeb7e0566bf819f502908399488c.tar.lz nixpkgs-1b5df99e7aefbeb7e0566bf819f502908399488c.tar.xz nixpkgs-1b5df99e7aefbeb7e0566bf819f502908399488c.tar.zst nixpkgs-1b5df99e7aefbeb7e0566bf819f502908399488c.zip |
Merge pull request #70295 from worldofpeace/mutter-eglstreams
Mutter eglstreams
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 06f54fd5207..d033f211c3a 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,16 +1,18 @@ -{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: +{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper, egl-wayland }: with stdenv.lib; xorgserver.overrideAttrs (oldAttrs: { name = "xwayland-${xorgserver.version}"; + buildInputs = oldAttrs.buildInputs ++ [ egl-wayland ]; propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind]; configureFlags = [ "--disable-docs" "--disable-devel-docs" "--enable-xwayland" + "--enable-xwayland-eglstream" "--disable-xorg" "--disable-xvfb" "--disable-xnest" |