Commit 6abae5cb authored by Alyssa Ross's avatar Alyssa Ross
Browse files

xwayland: set meta.mainProgram

parent e33c2a5e

pkgs/applications/window-managers/weston/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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" ];

pkgs/desktops/gnome/core/mutter/43/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"

pkgs/desktops/gnome/core/mutter/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"

pkgs/desktops/plasma-5/kwin/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ mkDerivation { 
  ];



  CXXFLAGS = [

    ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''

    ''-DNIXPKGS_XWAYLAND=\"${lib.getExe xwayland}\"''

  ];



  postInstall = ''

pkgs/servers/mir/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 \