diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-26 08:43:29 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-26 08:43:29 +0200 |
| commit | 081bd762e5faa4c1550fdffcce9d44401560ff20 (patch) | |
| tree | b9216e3726f1fcfb2cde52fb4d4a0a60667155fa /pkgs/applications/networking/browsers | |
| parent | 49aa28210808c1147728480685fc0f62f8f03636 (diff) | |
| parent | b61ad0afc2a70c148fcc823b678c954d7dae0041 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 4ecdec77ddbb3..2fc15a42a8bf4 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation ({ dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file libnotify xorg.pixman yasm libGLU libGL - xorg.libXScrnSaver xorg.xorgproto + xorg.xorgproto xorg.libXext unzip makeWrapper libevent libstartup_notification /* cairo */ libpng jemalloc glib @@ -277,6 +277,7 @@ stdenv.mkDerivation ({ patchelf --set-rpath "${lib.getLib libnotify }/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \ "$out"/lib/${binaryName}*/libxul.so + patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName} ''; doInstallCheck = true; |