summary refs log tree commit diff
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2020-08-25 09:04:58 -0300
committerGitHub <noreply@github.com>2020-08-25 09:04:58 -0300
commita607e0e1283eaeaca28e47282f755dfad641620d (patch)
tree72c5e877db1a8ba4fe66ba07e4dc2b8c9e7a5cf2
parent19a7012769093df2858a2fe4abe230ea447eaf54 (diff)
parentb979b12128870c7c214b591fd737b9ad958a2cea (diff)
downloadnixpkgs-a607e0e1283eaeaca28e47282f755dfad641620d.tar
nixpkgs-a607e0e1283eaeaca28e47282f755dfad641620d.tar.gz
nixpkgs-a607e0e1283eaeaca28e47282f755dfad641620d.tar.bz2
nixpkgs-a607e0e1283eaeaca28e47282f755dfad641620d.tar.lz
nixpkgs-a607e0e1283eaeaca28e47282f755dfad641620d.tar.xz
nixpkgs-a607e0e1283eaeaca28e47282f755dfad641620d.tar.zst
nixpkgs-a607e0e1283eaeaca28e47282f755dfad641620d.zip
Merge pull request #95896 from Enzime/fix-dpms-firefox
firefox: fix libXScrnSaver dynamic dependency
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix3
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 4ecdec77ddb..2fc15a42a8b 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;