diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-12-25 09:08:10 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-12-25 09:25:05 +0100 |
commit | 081e5c8387b957e8d6b6c174321a93a30f323650 (patch) | |
tree | add41f04be912e7fd37447aa555d7745e82d27b2 /pkgs/top-level | |
parent | 597373bbd5ca3237f3b198c150cf7dbb63183fb1 (diff) | |
parent | 1d131a09a42c47630248a75180882885d33d33b1 (diff) | |
download | nixlib-081e5c8387b957e8d6b6c174321a93a30f323650.tar nixlib-081e5c8387b957e8d6b6c174321a93a30f323650.tar.gz nixlib-081e5c8387b957e8d6b6c174321a93a30f323650.tar.bz2 nixlib-081e5c8387b957e8d6b6c174321a93a30f323650.tar.lz nixlib-081e5c8387b957e8d6b6c174321a93a30f323650.tar.xz nixlib-081e5c8387b957e8d6b6c174321a93a30f323650.tar.zst nixlib-081e5c8387b957e8d6b6c174321a93a30f323650.zip |
Merge #5061: add xwayland
Also resolve minor nitpicks -- *during* the merge commit.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2e87913768a..a6d855538d5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7925,6 +7925,8 @@ let xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { }; + xwayland = with xorg; callPackage ../servers/x11/xorg/xwayland.nix { }; + yaws = callPackage ../servers/http/yaws { }; zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix { @@ -11154,6 +11156,7 @@ let vaapi = null; libva = null; libwebp = null; + xwayland = null; }; weston = callPackage ../applications/window-managers/weston { |