diff options
| author | Brandon Dimcheff <bdimchef-git@wieldim.com> | 2014-12-23 11:53:58 -0500 |
|---|---|---|
| committer | Brandon Dimcheff <bdimchef-git@wieldim.com> | 2014-12-23 11:53:58 -0500 |
| commit | 139d7f6e1a3aafd79897e0c3997913d412b31308 (patch) | |
| tree | 855beb355f2c3be5015adcd52f104aa11faa793c /pkgs/misc/cups | |
| parent | 6a2195c3a5ff2cfb1e5ec0792976cdb609ddb022 (diff) | |
| download | nixlib-139d7f6e1a3aafd79897e0c3997913d412b31308.tar nixlib-139d7f6e1a3aafd79897e0c3997913d412b31308.tar.gz nixlib-139d7f6e1a3aafd79897e0c3997913d412b31308.tar.bz2 nixlib-139d7f6e1a3aafd79897e0c3997913d412b31308.tar.lz nixlib-139d7f6e1a3aafd79897e0c3997913d412b31308.tar.xz nixlib-139d7f6e1a3aafd79897e0c3997913d412b31308.tar.zst nixlib-139d7f6e1a3aafd79897e0c3997913d412b31308.zip | |
squish cups patches all into one statement
Diffstat (limited to 'pkgs/misc/cups')
| -rw-r--r-- | pkgs/misc/cups/filters.nix | 14 | ||||
| -rw-r--r-- | pkgs/misc/cups/longer-shell-path.patch | 2 |
2 files changed, 8 insertions, 8 deletions
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) { |