From fbf9162cbbad7bd4df72efd3bcf1c6e1b2b63546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com> Date: Thu, 25 Aug 2016 17:48:35 +0200 Subject: [PATCH] treewide: cups_filters -> cups-filters --- nixos/modules/services/printing/cupsd.nix | 6 +++--- pkgs/development/libraries/poppler/default.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 0bcb1a0c20c4..368d7ac761ac 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -4,7 +4,7 @@ with lib; let - inherit (pkgs) cups cups-pk-helper cups_filters gutenprint; + inherit (pkgs) cups cups-pk-helper cups-filters gutenprint; cfg = config.services.printing; @@ -34,7 +34,7 @@ let bindir = pkgs.buildEnv { name = "cups-progs"; paths = - [ cups.out additionalBackends cups_filters pkgs.ghostscript ] + [ cups.out additionalBackends cups-filters pkgs.ghostscript ] ++ optional cfg.gutenprint gutenprint ++ cfg.drivers; pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ]; @@ -329,7 +329,7 @@ in path = [ cups ]; - serviceConfig.ExecStart = "${cups_filters}/bin/cups-browsed"; + serviceConfig.ExecStart = "${cups-filters}/bin/cups-browsed"; restartTriggers = [ browsedFile ]; }; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 097031d54f13..d3034449df3b 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -7,7 +7,7 @@ , 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 sha256 = "11z4d5vrrd0m7w9bfydwabksk273z7z0xf2nwvzf5pk17p8kazcn"; in