mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
cups: minor expression refactoring
This commit is contained in:
parent
b8685ddf68
commit
2e4c5711a2
@ -71,11 +71,10 @@ stdenv.mkDerivation rec {
|
||||
# Delete obsolete stuff that conflicts with cups-filters.
|
||||
rm -rf $out/share/cups/banners $out/share/cups/data/testprint
|
||||
|
||||
mkdir $dev/bin
|
||||
mv $out/bin/cups-config $dev/bin/
|
||||
moveToOutput bin/cups-config "$dev"
|
||||
|
||||
# Rename systemd files provided by CUPS
|
||||
for f in $out/lib/systemd/system/*; do
|
||||
for f in "$out"/lib/systemd/system/*; do
|
||||
substituteInPlace "$f" \
|
||||
--replace "org.cups.cupsd" "cups" \
|
||||
--replace "org.cups." ""
|
||||
@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
# Use xdg-open when on Linux
|
||||
substituteInPlace $out/share/applications/cups.desktop \
|
||||
substituteInPlace "$out"/share/applications/cups.desktop \
|
||||
--replace "Exec=htmlview" "Exec=xdg-open"
|
||||
'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user