From ac45656b129ae657719fee2086439d5a0bfc076b Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Sat, 13 Jun 2020 15:59:38 -0700 Subject: [PATCH] thunderbird: Patch rpath to find libudev, which is part of systemd. --- .../networking/mailreaders/thunderbird/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 2ba2d2fca63ecf..9ebf5839344cff 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -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;