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

cups: minor expression refactoring

Browse Source
This commit is contained in:
Vladimír Čunát 2017-03-12 15:52:00 +01:00
parent b8685ddf68
commit 2e4c5711a2
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,11 +71,10 @@ 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
mkdir $dev/bin moveToOutput bin/cups-config "$dev"
mv $out/bin/cups-config $dev/bin/
# 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
substituteInPlace "$f" \ substituteInPlace "$f" \
--replace "org.cups.cupsd" "cups" \ --replace "org.cups.cupsd" "cups" \
--replace "org.cups." "" --replace "org.cups." ""
@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
done done
'' + optionalString stdenv.isLinux '' '' + optionalString stdenv.isLinux ''
# Use xdg-open when on Linux # Use xdg-open when on Linux
substituteInPlace $out/share/applications/cups.desktop \ substituteInPlace "$out"/share/applications/cups.desktop \
--replace "Exec=htmlview" "Exec=xdg-open" --replace "Exec=htmlview" "Exec=xdg-open"
''; '';