Merge pull request #90275 from IreneKnapp/thunderbird

thunderbird: Patch rpath to find libudev, which is part of systemd.
This commit is contained in:
Samuel Dionne-Riel
2020-06-14 15:47:11 -04:00
committed by GitHub
@@ -43,6 +43,7 @@
, rustc , rustc
, sqlite , sqlite
, stdenv , stdenv
, systemd
, unzip , unzip
, which , which
, writeScript , writeScript
@@ -305,11 +306,11 @@ stdenv.mkDerivation rec {
) )
''; '';
# FIXME: This can probably be removed as soon as we package a # FIXME: The XUL portion of this can probably be removed as soon as we
# Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
postFixup = '' postFixup = ''
local xul="$out/lib/thunderbird/libxul.so" local xul="$out/lib/thunderbird/libxul.so"
patchelf --set-rpath "${libnotify}/lib:$(patchelf --print-rpath $xul)" $xul patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul
''; '';
doInstallCheck = true; doInstallCheck = true;