mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Code Issues Wiki Activity

xwayland: set meta.mainProgram

Browse source
This commit is contained in:
Alyssa Ross 2023-05-27 13:26:40 +00:00
parent e33c2a5e4c
commit 6abae5cbb5
6 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/window-managers/weston/default.nix
View file

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
(lib.mesonBool "test-junit-xml" false)
(lib.mesonBool "xwayland" xwaylandSupport)
] ++ lib.optionals xwaylandSupport [
(lib.mesonOption "xwayland-path" "${xwayland.out}/bin/Xwayland")
(lib.mesonOption "xwayland-path" (lib.getExe xwayland))
];
passthru.providedSessions = [ "weston" ];

2
pkgs/desktops/gnome/core/mutter/43/default.nix
View file

@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Dinstalled_tests=false" # TODO: enable these
"-Dwayland_eglstream=true"
"-Dprofiler=true"
"-Dxwayland_path=${xwayland}/bin/Xwayland"
"-Dxwayland_path=${lib.getExe xwayland}"
# This should be auto detected, but it looks like it manages a false
# positive.
"-Dxwayland_initfd=disabled"

2
pkgs/desktops/gnome/core/mutter/default.nix
View file

@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Dtests=false"
"-Dwayland_eglstream=true"
"-Dprofiler=true"
"-Dxwayland_path=${xwayland}/bin/Xwayland"
"-Dxwayland_path=${lib.getExe xwayland}"
# This should be auto detected, but it looks like it manages a false
# positive.
"-Dxwayland_initfd=disabled"

2
pkgs/desktops/plasma-5/kwin/default.nix
View file

@ -144,7 +144,7 @@ mkDerivation {
];
CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
''-DNIXPKGS_XWAYLAND=\"${lib.getExe xwayland}\"''
];
postInstall = ''

2
pkgs/servers/mir/default.nix
View file

@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
# Fix Xwayland default
substituteInPlace src/miral/x11_support.cpp \
--replace '/usr/bin/Xwayland' '${xwayland}/bin/Xwayland'
--replace '/usr/bin/Xwayland' '${lib.getExe xwayland}'
# Fix paths for generating drm-formats
substituteInPlace src/platform/graphics/CMakeLists.txt \

1
pkgs/servers/x11/xorg/xwayland.nix
View file

@ -108,6 +108,7 @@ stdenv.mkDerivation rec {
description = "An X server for interfacing X11 apps with the Wayland protocol";
homepage = "https://wayland.freedesktop.org/xserver.html";
license = licenses.mit;
mainProgram = "Xwayland";
maintainers = with maintainers; [ emantor ];
platforms = platforms.linux;
};