alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

squish cups patches all into one statement

Browse source
This commit is contained in:
Brandon Dimcheff 2014-12-23 11:53:58 -05:00
parent 6a2195c3a5
commit 139d7f6e1a
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/misc/cups/filters.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, cups, poppler, fontconfig { stdenv, fetchurl, pkgconfig, cups, poppler, fontconfig
, libjpeg, libpng, perl, ijs, qpdf, dbus, bash }: , libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cups-filters-${version}"; name = "cups-filters-${version}";
@ -34,12 +34,12 @@ stdenv.mkDerivation rec {
substituteInPlace filter/gstoraster.c --replace execve execvpe substituteInPlace filter/gstoraster.c --replace execve execvpe
''; '';
patches = [ ./longer-shell-path.patch ]; patches = [
(substituteAll {
postPatch = src = ./longer-shell-path.patch;
'' bash = "${bash}/bin/bash";
substituteInPlace filter/foomatic-rip/foomaticrip.c --replace "/bin/bash" "${bash}/bin/bash" })
''; ];
postInstall = postInstall =
'' ''

2
pkgs/misc/cups/longer-shell-path.patch
View file

@ -7,7 +7,7 @@ index 1c019aa..431d2f9 100644
"/usr/lib/cups/filter"; "/usr/lib/cups/filter";
-char modern_shell[64] = "/bin/bash"; -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) void config_set_option(const char *key, const char *value)
{ {