diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2022-01-27 23:46:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-27 23:46:27 +0100 |
| commit | ecd6b2864c2cd3916c50bd6563491b93f36da161 (patch) | |
| tree | 172ac14e63c1519f7f2b63254dfa3e256d0a661d /pkgs/applications/networking/browsers | |
| parent | d9e21f284317f85b3476c0043f4efea87a226c3a (diff) | |
| parent | b2eb5f62a7fd94ab58acafec9f64e54f97c508a6 (diff) | |
| download | nixpkgs-ecd6b2864c2cd3916c50bd6563491b93f36da161.tar nixpkgs-ecd6b2864c2cd3916c50bd6563491b93f36da161.tar.gz nixpkgs-ecd6b2864c2cd3916c50bd6563491b93f36da161.tar.bz2 nixpkgs-ecd6b2864c2cd3916c50bd6563491b93f36da161.tar.lz nixpkgs-ecd6b2864c2cd3916c50bd6563491b93f36da161.tar.xz nixpkgs-ecd6b2864c2cd3916c50bd6563491b93f36da161.tar.zst nixpkgs-ecd6b2864c2cd3916c50bd6563491b93f36da161.zip | |
Merge pull request #147557 from wmertens/nixos-ozone
wayland: enable ozone via $NIXOS_OZONE_WL
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/google-chrome/default.nix | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c4521c89caa..f296da05c31 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -183,7 +183,8 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} + --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ed -v -s "$out/bin/chromium" << EOF 2i diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index e93ea8ca66d..b0fc87a1801 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -142,8 +142,9 @@ in stdenv.mkDerivation { makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \ --prefix LD_LIBRARY_PATH : "$rpath" \ --prefix PATH : "$binpath" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ - --add-flags ${escapeShellArg commandLineArgs} + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --add-flags ${escapeShellArg commandLineArgs} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do patchelf --set-rpath $rpath $elf |