Commit 54f60bfa authored by Vincenzo Mantova's avatar Vincenzo Mantova
Browse files

libcupsfilter: replace execvpe with execve on Darwin

parent cda17138

pkgs/by-name/li/libcupsfilters/execve.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- a/cupsfilters/ghostscript.c

+++ b/cupsfilters/ghostscript.c

@@ -629,7 +629,7 @@ gs_spawn (const char *filename,

     }

 

     // Execute Ghostscript command line ...

-    execvpe(filename, gsargv, envp);

+    execve(filename, gsargv, envp);

     if (log) log(ld, CF_LOGLEVEL_ERROR,

 		 "cfFilterGhostscript: Unable to launch Ghostscript: %s: %s",

 		 filename, strerror(errno));

pkgs/by-name/li/libcupsfilters/package.nix

+6 −2
Original line number Diff line number Diff line
@@ -61,7 +61,9 @@ stdenv.mkDerivation { 
      url = "https://github.com/OpenPrinting/libcupsfilters/commit/b69dfacec7f176281782e2f7ac44f04bf9633cfa.patch";

      hash = "sha256-rPUbgtTu7j3uUZrtUhUPO1vFbV6naxIWsHf6x3JhS74=";

    })

  ];

  ]

  # build on platforms without execvpe

  ++ lib.optional stdenv.hostPlatform.isDarwin ./execve.patch;



  nativeBuildInputs = [

    autoreconfHook
@@ -89,7 +91,9 @@ stdenv.mkDerivation { 
    "--with-ippfind-path=${lib.getExe' cups "ippfind"}"

    "--enable-imagefilters"

    "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf"

  ];

  ]

  # build on platforms without execvpe (path to Ghostscript must be absolute)

  ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gs-path=${lib.getExe ghostscript}";

  makeFlags = [

    "CUPS_SERVERBIN=$(out)/lib/cups"

    "CUPS_DATADIR=$(out)/share/cups"