cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

thunderbird: use lib.getLib systemd instead of systemd.lib

Browse source 
This will pick the `lib` output if it exists, otherwise default to `out`.
This commit is contained in:
Florian Klink 2020-08-12 20:14:08 +02:00
parent 24126d3cab
commit dbb5fbfb15
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/mailreaders/thunderbird/68.nix
View file

@ -310,7 +310,7 @@ stdenv.mkDerivation rec {
# package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
postFixup = '' postFixup = ''
local xul="$out/lib/thunderbird/libxul.so" 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; doInstallCheck = true;

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file

@ -304,7 +304,7 @@ stdenv.mkDerivation rec {
# package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
postFixup = '' postFixup = ''
local xul="$out/lib/thunderbird/libxul.so" 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; doInstallCheck = true;