From 12a25c3ce230dec2c4535ad61c739ea081f1403f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 12 Aug 2020 20:14:08 +0200 Subject: thunderbird: use lib.getLib systemd instead of systemd.lib This will pick the `lib` output if it exists, otherwise default to `out`. (cherry picked from commit dbb5fbfb1560a049b0ddc94f7176c268494f4bf0) --- nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix | 2 +- .../pkgs/applications/networking/mailreaders/thunderbird/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nixpkgs') diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 97aa0f792f3f..10f9ecb2e1a4 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/nixpkgs/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/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 781788304336..a354c5879b29 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -300,7 +300,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; -- cgit 1.4.1