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
commit 3b41eb14a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -43,6 +43,7 @@
, rustc
, sqlite
, stdenv
, systemd
, unzip
, which
, writeScript
@ -305,11 +306,11 @@ stdenv.mkDerivation rec {
)
'';
# FIXME: This can probably be removed as soon as we package a
# Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
# FIXME: The XUL portion of this can probably be removed as soon as we
# package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
postFixup = ''
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;