about summary refs log tree commit diff
path: root/nixpkgs
diff options
context:
space:
mode:
authorMichael Hoang <enzime@users.noreply.github.com>2020-08-21 19:12:43 +1000
committerAlyssa Ross <hi@alyssa.is>2020-09-29 11:53:13 +0000
commit5150d756b01bdbc2cbf82f6ef933bc49752d74c0 (patch)
tree71e725259cb5160a90892775fd2e2ea1e454fdb1 /nixpkgs
parent9e29f6c83590b1d8befbe473fc2a67a0db856fd3 (diff)
downloadnixlib-5150d756b01bdbc2cbf82f6ef933bc49752d74c0.tar
nixlib-5150d756b01bdbc2cbf82f6ef933bc49752d74c0.tar.gz
nixlib-5150d756b01bdbc2cbf82f6ef933bc49752d74c0.tar.bz2
nixlib-5150d756b01bdbc2cbf82f6ef933bc49752d74c0.tar.lz
nixlib-5150d756b01bdbc2cbf82f6ef933bc49752d74c0.tar.xz
nixlib-5150d756b01bdbc2cbf82f6ef933bc49752d74c0.tar.zst
nixlib-5150d756b01bdbc2cbf82f6ef933bc49752d74c0.zip
firefox: fix libXScrnSaver dynamic dependency
(cherry picked from commit b979b12128870c7c214b591fd737b9ad958a2cea)
Diffstat (limited to 'nixpkgs')
-rw-r--r--nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
index 81f8ef88113c..41231f28f18d 100644
--- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/nixpkgs/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;