xwayland: set meta.mainProgram

+6 -5
+1 -1
pkgs/applications/window-managers/weston/default.nix
··· 52 (lib.mesonBool "test-junit-xml" false) 53 (lib.mesonBool "xwayland" xwaylandSupport) 54 ] ++ lib.optionals xwaylandSupport [ 55 - (lib.mesonOption "xwayland-path" "${xwayland.out}/bin/Xwayland") 56 ]; 57 58 passthru.providedSessions = [ "weston" ];
··· 52 (lib.mesonBool "test-junit-xml" false) 53 (lib.mesonBool "xwayland" xwaylandSupport) 54 ] ++ lib.optionals xwaylandSupport [ 55 + (lib.mesonOption "xwayland-path" (lib.getExe xwayland)) 56 ]; 57 58 passthru.providedSessions = [ "weston" ];
+1 -1
pkgs/desktops/gnome/core/mutter/43/default.nix
··· 74 "-Dinstalled_tests=false" # TODO: enable these 75 "-Dwayland_eglstream=true" 76 "-Dprofiler=true" 77 - "-Dxwayland_path=${xwayland}/bin/Xwayland" 78 # This should be auto detected, but it looks like it manages a false 79 # positive. 80 "-Dxwayland_initfd=disabled"
··· 74 "-Dinstalled_tests=false" # TODO: enable these 75 "-Dwayland_eglstream=true" 76 "-Dprofiler=true" 77 + "-Dxwayland_path=${lib.getExe xwayland}" 78 # This should be auto detected, but it looks like it manages a false 79 # positive. 80 "-Dxwayland_initfd=disabled"
+1 -1
pkgs/desktops/gnome/core/mutter/default.nix
··· 81 "-Dtests=false" 82 "-Dwayland_eglstream=true" 83 "-Dprofiler=true" 84 - "-Dxwayland_path=${xwayland}/bin/Xwayland" 85 # This should be auto detected, but it looks like it manages a false 86 # positive. 87 "-Dxwayland_initfd=disabled"
··· 81 "-Dtests=false" 82 "-Dwayland_eglstream=true" 83 "-Dprofiler=true" 84 + "-Dxwayland_path=${lib.getExe xwayland}" 85 # This should be auto detected, but it looks like it manages a false 86 # positive. 87 "-Dxwayland_initfd=disabled"
+1 -1
pkgs/desktops/plasma-5/kwin/default.nix
··· 144 ]; 145 146 CXXFLAGS = [ 147 - ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' 148 ]; 149 150 postInstall = ''
··· 144 ]; 145 146 CXXFLAGS = [ 147 + ''-DNIXPKGS_XWAYLAND=\"${lib.getExe xwayland}\"'' 148 ]; 149 150 postInstall = ''
+1 -1
pkgs/servers/mir/default.nix
··· 86 87 # Fix Xwayland default 88 substituteInPlace src/miral/x11_support.cpp \ 89 - --replace '/usr/bin/Xwayland' '${xwayland}/bin/Xwayland' 90 91 # Fix paths for generating drm-formats 92 substituteInPlace src/platform/graphics/CMakeLists.txt \
··· 86 87 # Fix Xwayland default 88 substituteInPlace src/miral/x11_support.cpp \ 89 + --replace '/usr/bin/Xwayland' '${lib.getExe xwayland}' 90 91 # Fix paths for generating drm-formats 92 substituteInPlace src/platform/graphics/CMakeLists.txt \
+1
pkgs/servers/x11/xorg/xwayland.nix
··· 108 description = "An X server for interfacing X11 apps with the Wayland protocol"; 109 homepage = "https://wayland.freedesktop.org/xserver.html"; 110 license = licenses.mit; 111 maintainers = with maintainers; [ emantor ]; 112 platforms = platforms.linux; 113 };
··· 108 description = "An X server for interfacing X11 apps with the Wayland protocol"; 109 homepage = "https://wayland.freedesktop.org/xserver.html"; 110 license = licenses.mit; 111 + mainProgram = "Xwayland"; 112 maintainers = with maintainers; [ emantor ]; 113 platforms = platforms.linux; 114 };