diff options
| author | Jascha Geerds <jg@ekby.de> | 2015-04-13 22:54:19 +0200 |
|---|---|---|
| committer | Jascha Geerds <jg@ekby.de> | 2015-04-13 22:54:19 +0200 |
| commit | 57c1e7f23fc1d86e10307f4199d41bf00d230957 (patch) | |
| tree | 7dbe03c6cc0540415f3bc983db2e3e086bbd0d85 /pkgs | |
| parent | bf365c0da2338dfb740f33cb438a31576a43755d (diff) | |
| parent | 29f431e2a4ec69463cd61cac79961a7a76bdf6f1 (diff) | |
| download | nixlib-57c1e7f23fc1d86e10307f4199d41bf00d230957.tar nixlib-57c1e7f23fc1d86e10307f4199d41bf00d230957.tar.gz nixlib-57c1e7f23fc1d86e10307f4199d41bf00d230957.tar.bz2 nixlib-57c1e7f23fc1d86e10307f4199d41bf00d230957.tar.lz nixlib-57c1e7f23fc1d86e10307f4199d41bf00d230957.tar.xz nixlib-57c1e7f23fc1d86e10307f4199d41bf00d230957.tar.zst nixlib-57c1e7f23fc1d86e10307f4199d41bf00d230957.zip | |
Merge pull request #6770 from kirelagin/cups-browsed-avahi
cups-browsed: build with Avahi
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/cups/filters.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 269f0df10901..8043cbb1506e 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig -, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash }: +, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi }: stdenv.mkDerivation rec { name = "cups-filters-${version}"; @@ -26,14 +26,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl - ijs qpdf dbus + ijs qpdf dbus avahi ]; - preBuild = '' - substituteInPlace Makefile --replace "/etc/rc.d" "$out/etc/rc.d" - ''; - - configureFlags = "--with-pdftops=pdftops --enable-imagefilters"; + configureFlags = "--with-pdftops=pdftops --enable-imagefilters --with-rcdir=no"; makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups"; |