about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/chromium/common.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-08-14 15:42:31 -0400
committerGitHub <noreply@github.com>2019-08-14 15:42:31 -0400
commit8281a67be00313b76a82e043ec2fdbabc7931e56 (patch)
tree3193f4cf63884a45e049bc387df48209733a1947 /pkgs/applications/networking/browsers/chromium/common.nix
parentf5a7cf79411eec74135f759edc64ef8ad16eb797 (diff)
parent6a0a07318763375dd90125fdf73f690e6c49687e (diff)
downloadnixlib-8281a67be00313b76a82e043ec2fdbabc7931e56.tar
nixlib-8281a67be00313b76a82e043ec2fdbabc7931e56.tar.gz
nixlib-8281a67be00313b76a82e043ec2fdbabc7931e56.tar.bz2
nixlib-8281a67be00313b76a82e043ec2fdbabc7931e56.tar.lz
nixlib-8281a67be00313b76a82e043ec2fdbabc7931e56.tar.xz
nixlib-8281a67be00313b76a82e043ec2fdbabc7931e56.tar.zst
nixlib-8281a67be00313b76a82e043ec2fdbabc7931e56.zip
Merge pull request #64809 from ambrop72/chromium-egl-fix
chromium: Fix running with --use-gl=egl.
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 3e63389be02d..45c125985120 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -13,7 +13,7 @@
 , bison, gperf
 , glib, gtk3, dbus-glib
 , glibc
-, libXScrnSaver, libXcursor, libXtst, libGLU_combined
+, libXScrnSaver, libXcursor, libXtst, libGLU_combined, libGL
 , protobuf, speechd, libXdamage, cups
 , ffmpeg, libxslt, libxml2, at-spi2-core
 , jdk
@@ -309,6 +309,13 @@ let
       targets = extraAttrs.buildTargets or [];
       commands = map buildCommand targets;
     in concatStringsSep "\n" commands;
+
+    postFixup = ''
+      # Make sure that libGLESv2 is found by dlopen (if using EGL).
+      chromiumBinary="$libExecPath/$packageName"
+      origRpath="$(patchelf --print-rpath "$chromiumBinary")"
+      patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary"
+    '';
   };
 
 # Remove some extraAttrs we supplied to the base attributes already.