diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-08-07 12:29:39 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-08-07 12:29:39 +0200 |
| commit | 5581b5521e14317c3507a6e8451a3f14996e5c4d (patch) | |
| tree | 7aadee5a9ef5d6e2acc8929818c6eb2d2099e2ae /nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix | |
| parent | de94c6c62e2f86b3667386a42690d6bb376a2f58 (diff) | |
| parent | 8e2b14aceb1d40c7e8b84c03a7c78955359872bb (diff) | |
Merge commit '8e2b14aceb1d40c7e8b84c03a7c78955359872bb'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index e5cd08f7df7..8d711b6de2f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -7,6 +7,9 @@ , dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos, libdrm, mesa +# Command line programs +, coreutils + # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -58,7 +61,7 @@ let liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - kerberos libdrm mesa + kerberos libdrm mesa coreutils ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; @@ -102,6 +105,12 @@ in stdenv.mkDerivation { cp -a opt/* $out/share cp -a usr/share/* $out/share + # To fix --use-gl=egl: + test -e $out/share/google/$appname/libEGL.so + ln -s libEGL.so $out/share/google/$appname/libEGL.so.1 + test -e $out/share/google/$appname/libGLESv2.so + ln -s libGLESv2.so $out/share/google/$appname/libGLESv2.so.2 + substituteInPlace $out/share/applications/google-$appname.desktop \ --replace /usr/bin/google-chrome-$dist $exe substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \ |