diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-24 00:03:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-24 00:03:26 +0000 |
| commit | 035c6df194d536bf6de14a100552304c730357d8 (patch) | |
| tree | 212743ffe437cd715755f181c9504a9a00a4f8a3 /pkgs/servers/x11 | |
| parent | e81936d59edde7c2e40980a59d1ccdf8bbebbaef (diff) | |
| parent | 0e6413dbff4a5cd6d29e9f2bf349d3aefe89990b (diff) | |
| download | nixlib-035c6df194d536bf6de14a100552304c730357d8.tar nixlib-035c6df194d536bf6de14a100552304c730357d8.tar.gz nixlib-035c6df194d536bf6de14a100552304c730357d8.tar.bz2 nixlib-035c6df194d536bf6de14a100552304c730357d8.tar.lz nixlib-035c6df194d536bf6de14a100552304c730357d8.tar.xz nixlib-035c6df194d536bf6de14a100552304c730357d8.tar.zst nixlib-035c6df194d536bf6de14a100552304c730357d8.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 28ebf020e1cd..7ad83147fa16 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -19,7 +19,7 @@ , libXt , libdrm , libtirpc -, libunwind +, withLibunwind ? true, libunwind , libxcb , libxkbfile , libxshmfence @@ -39,15 +39,17 @@ , xorgproto , xtrans , zlib -, defaultFontPath ? "" }: +, defaultFontPath ? "" +, gitUpdater +}: stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.0"; + version = "23.2.1"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-fzPsKjTebmauG35Ehyw6IUYZKHLHGbms8ZKBTtur1MU="; + sha256 = "sha256-7rwmksOqgGF9eEKLxux7kbJUqYIU0qcOmXCYUDzW75A="; }; depsBuildBuild = [ @@ -79,7 +81,6 @@ stdenv.mkDerivation rec { libXt libdrm libtirpc - libunwind libxcb libxkbfile libxshmfence @@ -93,6 +94,8 @@ stdenv.mkDerivation rec { xorgproto xtrans zlib + ] ++ lib.optionals withLibunwind [ + libunwind ]; mesonFlags = [ (lib.mesonBool "xwayland_eglstream" true) @@ -101,9 +104,15 @@ stdenv.mkDerivation rec { (lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin") (lib.mesonOption "xkb_dir" "${xkeyboard_config}/etc/X11/xkb") (lib.mesonOption "xkb_output_dir" "${placeholder "out"}/share/X11/xkb/compiled") - (lib.mesonBool "libunwind" (libunwind != null)) + (lib.mesonBool "libunwind" withLibunwind) ]; + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://gitlab.freedesktop.org/xorg/xserver.git"; + rev-prefix = "xwayland-"; + }; + meta = with lib; { description = "An X server for interfacing X11 apps with the Wayland protocol"; homepage = "https://wayland.freedesktop.org/xserver.html"; |