diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-15 08:07:00 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-15 08:07:00 +0200 |
| commit | 59dda0a42aa88005dab38cbdf1c39267431756a5 (patch) | |
| tree | fc1635b48ef7c57623d7400ee6274cecc9da03dc /pkgs/applications/networking/mailreaders/thunderbird/default.nix | |
| parent | 6857bccf12e1b55b75e22342368feef22c78d7b9 (diff) | |
| parent | 9d0c3ffe6783d59b427d018e8341e0084737fde9 (diff) | |
| download | nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar.gz nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar.bz2 nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar.lz nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar.xz nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.tar.zst nixlib-59dda0a42aa88005dab38cbdf1c39267431756a5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/mailreaders/thunderbird/default.nix')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e36d99886e21..73536ae5fc1b 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; |