From 139d7f6e1a3aafd79897e0c3997913d412b31308 Mon Sep 17 00:00:00 2001 From: Brandon Dimcheff Date: Tue, 23 Dec 2014 11:53:58 -0500 Subject: squish cups patches all into one statement --- pkgs/misc/cups/filters.nix | 14 +++++++------- pkgs/misc/cups/longer-shell-path.patch | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/misc/cups') diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 18723779527f..524662a0ee6c 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cups, poppler, fontconfig -, libjpeg, libpng, perl, ijs, qpdf, dbus, bash }: +, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash }: stdenv.mkDerivation rec { name = "cups-filters-${version}"; @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { substituteInPlace filter/gstoraster.c --replace execve execvpe ''; - patches = [ ./longer-shell-path.patch ]; - - postPatch = - '' - substituteInPlace filter/foomatic-rip/foomaticrip.c --replace "/bin/bash" "${bash}/bin/bash" - ''; + patches = [ + (substituteAll { + src = ./longer-shell-path.patch; + bash = "${bash}/bin/bash"; + }) + ]; postInstall = '' diff --git a/pkgs/misc/cups/longer-shell-path.patch b/pkgs/misc/cups/longer-shell-path.patch index 351bcc0b4096..a15fd4832258 100644 --- a/pkgs/misc/cups/longer-shell-path.patch +++ b/pkgs/misc/cups/longer-shell-path.patch @@ -7,7 +7,7 @@ index 1c019aa..431d2f9 100644 "/usr/lib/cups/filter"; -char modern_shell[64] = "/bin/bash"; -+char modern_shell[128] = "/bin/bash"; ++char modern_shell[128] = "@bash@"; void config_set_option(const char *key, const char *value) { -- cgit 1.4.1