public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #95896 from Enzime/fix-dpms-firefox

Browse Source 
firefox: fix libXScrnSaver dynamic dependency
This commit is contained in:
Anderson Torres 2020-08-25 09:04:58 -03:00 committed by GitHub
commit a607e0e128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -108,7 +108,7 @@ stdenv.mkDerivation ({
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
libnotify xorg.pixman yasm libGLU libGL libnotify xorg.pixman yasm libGLU libGL
xorg.libXScrnSaver xorg.xorgproto xorg.xorgproto
xorg.libXext unzip makeWrapper xorg.libXext unzip makeWrapper
libevent libstartup_notification /* cairo */ libevent libstartup_notification /* cairo */
libpng jemalloc glib libpng jemalloc glib
@ -277,6 +277,7 @@ stdenv.mkDerivation ({
patchelf --set-rpath "${lib.getLib libnotify patchelf --set-rpath "${lib.getLib libnotify
}/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \ }/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \
"$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; doInstallCheck = true;