From 82eed03bfa50bba808021cd5e55e1bbc88b3efa1 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Thu, 12 Mar 2015 10:59:59 +0300 Subject: [PATCH 1/2] cups-filters: fix build on non-NixOS --- pkgs/misc/cups/filters.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 269f0df1090..232e4f1b23c 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -29,11 +29,7 @@ stdenv.mkDerivation rec { ijs qpdf dbus ]; - 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"; From 29f431e2a4ec69463cd61cac79961a7a76bdf6f1 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Thu, 12 Mar 2015 11:00:39 +0300 Subject: [PATCH 2/2] cups-browsed: build with Avahi Fixes 5409. --- pkgs/misc/cups/filters.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 232e4f1b23c..8043cbb1506 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,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl - ijs qpdf dbus + ijs qpdf dbus avahi ]; configureFlags = "--with-pdftops=pdftops --enable-imagefilters --with-rcdir=no";