diff --git a/overlays/discord-canary-system.nix b/overlays/discord-canary-system.nix index 4fa6b1f..31e7170 100644 --- a/overlays/discord-canary-system.nix +++ b/overlays/discord-canary-system.nix @@ -14,6 +14,7 @@ final: prev: rec { "--ignore-gpu-blocklist" "--enable-gpu-rasterization" "--enable-zero-copy" + "--disable-gpu-driver-bug-workarounds" ]; }); mkDiscord = @@ -132,7 +133,9 @@ final: prev: rec { ]; flags = (lib.optionals isWayland [ - "--enable-features=UseOzonePlatform" + "--flag-switches-begin" + "--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer" + "--flag-switches-end" "--ozone-platform=wayland" "--enable-webrtc-pipewire-capturer" ]) ++ extraOptions; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 21c6d02..00a4bf4 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -121,42 +121,43 @@ in chromiumWayland = let flags = [ - "--enable-features=UseOzonePlatform" - "--ozone-platform=wayland" "--enable-vulkan" + "--flag-switches-begin" + "--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer,IgnoreGPUBlocklist" + "--flag-switches-end" + "--ozone-platform=wayland" "--enable-webrtc-pipewire-capturer" "--ignore-gpu-blocklist" "--enable-gpu-rasterization" "--enable-zero-copy" + "--disable-gpu-driver-bug-workarounds" # "--enable-features=VaapiVideoDecoder" # "--use-gl=egl" - # "--disable-gpu-driver-bug-workarounds" ]; in pkgs.writeScriptBin "chromium-wayland" '' #!${pkgs.stdenv.shell} chromium ${lib.concatStringsSep " " flags} ''; - chromiumWaylandPkg = with pkgs; - let name = "chromium-wayland"; in - stdenv.mkDerivation { - pname = name; - version = chromium.version; - - nativeBuildInputs = [ copyDesktopItems ]; - desktopItems = [ - (makeDesktopItem { - inherit name; - exec = name; - desktopName = "Chromium Wayland"; - genericName = "Web Browser"; - }) - ]; + chromiumWaylandPkg = + let + name = "chromium-wayland"; + desktop = pkgs.makeDesktopItem { + inherit name; + exec = name; + icon = "chromium-browser"; + desktopName = "Chromium Wayland"; + genericName = "Web Browser"; + }; + in + pkgs.stdenv.mkDerivation { + name = name; phases = [ "installPhase" ]; installPhase = '' - mkdir -p $out/bin - ln -s ${chromiumWayland}/bin/chromium-wayland $out/bin/chromium-wayland + mkdir $out + ln -s ${chromiumWayland}/bin $out/bin + ln -s ${desktop}/share $out/share ''; };