public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cups: fix #24339: broken paths in cups-config

Browse Source 
Note: this doesn't fix cups-dymo by itself.
It causes a slightly nontrivial rebuild on Linux.
This commit is contained in:
Vladimír Čunát 2017-03-27 18:56:16 +02:00
parent 6ef630a125
commit 036f4b2f04
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/misc/cups/default.nix
View File

@ -79,7 +79,12 @@ stdenv.mkDerivation rec {
# Delete obsolete stuff that conflicts with cups-filters. # Delete obsolete stuff that conflicts with cups-filters.
rm -rf $out/share/cups/banners $out/share/cups/data/testprint rm -rf $out/share/cups/banners $out/share/cups/data/testprint
# Some outputs in cups-config were unexpanded and some even wrong.
moveToOutput bin/cups-config "$dev" moveToOutput bin/cups-config "$dev"
sed -e "/^cups_serverbin=/s|\$(lib)|$out|" \
-e "s|\$(out)|$out|" \
-e "s|\$(lib)|$lib|" \
-i "$dev/bin/cups-config"
# Rename systemd files provided by CUPS # Rename systemd files provided by CUPS
for f in "$out"/lib/systemd/system/*; do for f in "$out"/lib/systemd/system/*; do