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/filters.nix | |
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/filters.nix')
-rw-r--r-- | pkgs/misc/cups/filters.nix | 14 |
1 files changed, 7 insertions, 7 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 = '' |