diff options
| author | David Virgilio <drvirgilio@gmail.com> | 2014-11-20 00:37:19 -0600 |
|---|---|---|
| committer | David Virgilio <drvirgilio@gmail.com> | 2014-11-20 06:21:47 -0600 |
| commit | 9a2b2e7b34190f553f41aa80297acf383700a19d (patch) | |
| tree | d4fb99456f2863cd9d0d828d0dd0e8b8093709ea | |
| parent | 17cf42d876f8b33fcd29fec65c04e0c355ffc0f4 (diff) | |
| download | nixlib-9a2b2e7b34190f553f41aa80297acf383700a19d.tar nixlib-9a2b2e7b34190f553f41aa80297acf383700a19d.tar.gz nixlib-9a2b2e7b34190f553f41aa80297acf383700a19d.tar.bz2 nixlib-9a2b2e7b34190f553f41aa80297acf383700a19d.tar.lz nixlib-9a2b2e7b34190f553f41aa80297acf383700a19d.tar.xz nixlib-9a2b2e7b34190f553f41aa80297acf383700a19d.tar.zst nixlib-9a2b2e7b34190f553f41aa80297acf383700a19d.zip | |
new package: xwayland
| -rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 41 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 43 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix new file mode 100644 index 000000000000..ae625240798d --- /dev/null +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -0,0 +1,41 @@ + +{ stdenv, wayland, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper } : + +with stdenv.lib; + +overrideDerivation xorgserver (oldAttrs: { + + name = "xwayland-${xorgserver.version}"; + propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs + ++ [wayland epoxy libxslt makeWrapper libunwind]; + configureFlags = [ + "--disable-docs" + "--disable-devel-docs" + "--enable-xwayland" + "--disable-xorg" + "--disable-xvfb" + "--disable-xnest" + "--disable-xquartz" + "--disable-xwin" + "--with-default-font-path=" + "--with-xkb-bin-directory=${xkbcomp}/bin" + "--with-xkb-path=${xkeyboard_config}/etc/X11/xkb" + "--with-xkb-output=$out/share/X11/xkb/compiled" + ]; + + postInstall = '' + rm -fr $out/share/X11/xkb/compiled + ln -s /var/tmp $out/share/X11/xkb/compiled + ''; + +}) // { + meta = { + description = "An X server for interfacing X11 apps with the Wayland protocol"; + homepage = http://wayland.freedesktop.org/xserver.html; + license = licenses.mit; + platforms = platforms.linux; +}; +} + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55c7e9bb6442..b8dbe4c7b419 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7828,6 +7828,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 { |