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

treewide: cups_filters -> cups-filters

Browse Source
This commit is contained in:
Bjørn Forsman 2016-08-25 17:48:35 +02:00
parent 56f1ceecab
commit fbf9162cbb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/printing/cupsd.nix
View File

@ -4,7 +4,7 @@ with lib;
let let
inherit (pkgs) cups cups-pk-helper cups_filters gutenprint; inherit (pkgs) cups cups-pk-helper cups-filters gutenprint;
cfg = config.services.printing; cfg = config.services.printing;
@ -34,7 +34,7 @@ let
bindir = pkgs.buildEnv { bindir = pkgs.buildEnv {
name = "cups-progs"; name = "cups-progs";
paths = paths =
[ cups.out additionalBackends cups_filters pkgs.ghostscript ] [ cups.out additionalBackends cups-filters pkgs.ghostscript ]
++ optional cfg.gutenprint gutenprint ++ optional cfg.gutenprint gutenprint
++ cfg.drivers; ++ cfg.drivers;
pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ]; pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ];
@ -329,7 +329,7 @@ in
path = [ cups ]; path = [ cups ];
serviceConfig.ExecStart = "${cups_filters}/bin/cups-browsed"; serviceConfig.ExecStart = "${cups-filters}/bin/cups-browsed";
restartTriggers = [ browsedFile ]; restartTriggers = [ browsedFile ];
}; };

2
pkgs/development/libraries/poppler/default.nix
View File

@ -7,7 +7,7 @@
, minimal ? false, suffix ? "glib" , minimal ? false, suffix ? "glib"
}: }:
let # beware: updates often break cups_filters build let # beware: updates often break cups-filters build
version = "0.46.0"; # even major numbers are stable version = "0.46.0"; # even major numbers are stable
sha256 = "11z4d5vrrd0m7w9bfydwabksk273z7z0xf2nwvzf5pk17p8kazcn"; sha256 = "11z4d5vrrd0m7w9bfydwabksk273z7z0xf2nwvzf5pk17p8kazcn";
in in