diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-03-27 18:56:16 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-27 18:56:59 +0200 |
| commit | 036f4b2f04b7f69e02096ed38980f989dcd25e62 (patch) | |
| tree | 96d0110007f8ffa9d3c942fa0e542fce96a3eaf2 /pkgs/misc/cups/default.nix | |
| parent | 6ef630a12549c2f36bc1706718c5ad12e0fa05f3 (diff) | |
| download | nixlib-036f4b2f04b7f69e02096ed38980f989dcd25e62.tar nixlib-036f4b2f04b7f69e02096ed38980f989dcd25e62.tar.gz nixlib-036f4b2f04b7f69e02096ed38980f989dcd25e62.tar.bz2 nixlib-036f4b2f04b7f69e02096ed38980f989dcd25e62.tar.lz nixlib-036f4b2f04b7f69e02096ed38980f989dcd25e62.tar.xz nixlib-036f4b2f04b7f69e02096ed38980f989dcd25e62.tar.zst nixlib-036f4b2f04b7f69e02096ed38980f989dcd25e62.zip | |
cups: fix #24339: broken paths in cups-config
Note: this doesn't fix cups-dymo by itself. It causes a slightly nontrivial rebuild on Linux.
Diffstat (limited to 'pkgs/misc/cups/default.nix')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index f47ba022c352..38440bac81a4 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -79,7 +79,12 @@ stdenv.mkDerivation rec { # Delete obsolete stuff that conflicts with cups-filters. 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" + 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 for f in "$out"/lib/systemd/system/*; do |