treewide: Mass replace 'cups}/lib' to refer the 'out' output
This commit is contained in:
parent
96372f2edb
commit
dc8e939dbc
@ -11,21 +11,21 @@ let
|
||||
additionalBackends = pkgs.runCommand "additional-cups-backends" { }
|
||||
''
|
||||
mkdir -p $out
|
||||
if [ ! -e ${cups}/lib/cups/backend/smb ]; then
|
||||
if [ ! -e ${cups.out}/lib/cups/backend/smb ]; then
|
||||
mkdir -p $out/lib/cups/backend
|
||||
ln -sv ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
|
||||
fi
|
||||
|
||||
# Provide support for printing via HTTPS.
|
||||
if [ ! -e ${cups}/lib/cups/backend/https ]; then
|
||||
if [ ! -e ${cups.out}/lib/cups/backend/https ]; then
|
||||
mkdir -p $out/lib/cups/backend
|
||||
ln -sv ${cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
|
||||
ln -sv ${cups.out}/lib/cups/backend/ipp $out/lib/cups/backend/https
|
||||
fi
|
||||
'';
|
||||
|
||||
# Here we can enable additional backends, filters, etc. that are not
|
||||
# part of CUPS itself, e.g. the SMB backend is part of Samba. Since
|
||||
# we can't update ${cups}/lib/cups itself, we create a symlink tree
|
||||
# we can't update ${cups.out}/lib/cups itself, we create a symlink tree
|
||||
# here and add the additional programs. The ServerBin directive in
|
||||
# cupsd.conf tells cupsd to use this tree.
|
||||
bindir = pkgs.buildEnv {
|
||||
|
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postFixup = ''
|
||||
oldRPATH=`patchelf --print-rpath $out/lib/opera/opera`
|
||||
patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera
|
||||
patchelf --set-rpath $oldRPATH:${cups.out}/lib $out/lib/opera/opera
|
||||
|
||||
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
|
||||
# It have no reasons to exist in a redistribuable package
|
||||
|
Loading…
Reference in New Issue
Block a user