diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:39:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:39:23 +0200 |
| commit | fe9a3e3e63fa59c8014d454b0efd3231bdd19350 (patch) | |
| tree | 3546e83902366b34599e8d5f6a698e37935a104d /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | ed3cb39bfa7234e5bbf2b50ce6f658ef5fda686a (diff) | |
| parent | c68f58d95c0e34d91ff3e4f08464954fd0e9e466 (diff) | |
| download | nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.gz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.bz2 nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.lz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.xz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.zst nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 9 |
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 3e63389be02..45c12598512 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. |