diff options
| author | Florian Klink <flokli@flokli.de> | 2020-08-24 12:42:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 12:42:24 +0200 |
| commit | 40d2968ebf3b2b4c547caaa776b6eb875e1e5f83 (patch) | |
| tree | e162a8e316931cc8eab5f0123dcbe76f24b21eea /pkgs/applications/networking/mailreaders | |
| parent | 6d122d67fa3ae31f36405ecad6bf0cbfc156ed79 (diff) | |
| parent | 618e273861f7eda1f04fd8909cbe066e75556070 (diff) | |
Merge pull request #94354 from flokli/systemd-246
systemd: 245.6 -> 246
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 3bb68d7805cf7..6c6bf6f93db3a 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , autoPatchelfHook , alsaLib @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ coreutils openssl - udev.lib + (lib.getLib udev) ]; unpackPhase = '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 3143c7f62bb34..3247f53f0e89c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -307,7 +307,7 @@ stdenv.mkDerivation rec { # 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:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul + patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 53d337067d7fe..bd757e031c990 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -301,7 +301,7 @@ stdenv.mkDerivation rec { # 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:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul + patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul ''; doInstallCheck = true; |