diff options
| author | zseri <zseri.devel@ytrizja.de> | 2021-12-02 09:30:27 +0100 |
|---|---|---|
| committer | zseri <zseri.devel@ytrizja.de> | 2022-02-23 23:38:05 +0100 |
| commit | 9a93279738708df0801185a35fb31671b4616b70 (patch) | |
| tree | 5d04d21da51ef438d6a7084614ec5ded6739813d /pkgs/misc/cups | |
| parent | a91e85efa3d9b39b9b9930fd7a961192b9a1c754 (diff) | |
| download | nixpkgs-9a93279738708df0801185a35fb31671b4616b70.tar nixpkgs-9a93279738708df0801185a35fb31671b4616b70.tar.gz nixpkgs-9a93279738708df0801185a35fb31671b4616b70.tar.bz2 nixpkgs-9a93279738708df0801185a35fb31671b4616b70.tar.lz nixpkgs-9a93279738708df0801185a35fb31671b4616b70.tar.xz nixpkgs-9a93279738708df0801185a35fb31671b4616b70.tar.zst nixpkgs-9a93279738708df0801185a35fb31671b4616b70.zip | |
cups-filters: make it easier to disable avahi
: previous override code to do this was :
cups-filters = prev.lib.pipe prev.cups-filters [
(x: x.overrideAttrs (old: { configureFlags = old.configureFlags ++ ["--disable-avahi"]; }))
(x: x.override { avahi = null; })
];
: new override code to do this is :
cups-filters = prev.cups-filters.override { withAvahi = false; };
Diffstat (limited to 'pkgs/misc/cups')
| -rw-r--r-- | pkgs/misc/cups/filters.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index a4cb617a22a..5efa78edcd9 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -24,6 +24,7 @@ , qpdf , stdenv , which +, withAvahi ? true }: let @@ -42,7 +43,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ - avahi cups dbus fontconfig @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { poppler poppler_utils qpdf - ]; + ] ++ lib.optionals withAvahi [ avahi ]; configureFlags = [ "--with-mutool-path=${mupdf}/bin/mutool" @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" "--localstatedir=/var" "--sysconfdir=/etc" - ]; + ] ++ lib.optionals (!withAvahi) [ "--disable-avahi" ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; |