01/02: gnu: netpbm: Look for 'gsc' instead of 'gs'.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 61dc82d9b90d0545739c30bfc33003bd062071f0
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jun 17 15:21:11 2016 +0200

    gnu: netpbm: Look for 'gsc' instead of 'gs'.
    
    This is a followup to commit eb354bdacbf4154ec66038dac07f19bf4ced1fad.
    
    * gnu/packages/netpbm.scm (netpbm)[arguments]: In 'configure' phase,
    patch 'pstopnm.c' to look for 'gsc'.
---
 gnu/packages/netpbm.scm |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm
index e2d409a..20ca87b 100644
--- a/gnu/packages/netpbm.scm
+++ b/gnu/packages/netpbm.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
-;;; Copyright © 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2015, 2016 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -114,10 +114,17 @@
              (display "ZLIB = libz.so\n" f)
              (display (string-append "LDFLAGS += -Wl,-rpath=" %output "/lib") 
f)
              (close-port f))
+
            (let ((rgb (string-append (assoc-ref inputs "xorg-rgb")
                                      "/share/X11/rgb.txt")))
              (substitute* "pm_config.in.h"
-               (("/usr/share/X11/rgb.txt") rgb)))
+               (("/usr/share/X11/rgb.txt") rgb))
+
+             ;; Our Ghostscript no longer provides the 'gs' command, only
+             ;; 'gsc', so look for that instead.
+             (substitute* "converter/other/pstopnm.c"
+               (("\"%s/gs\"")
+                "\"%s/gsc\"")))
            #t))
        (add-before 'check 'setup-check
          (lambda _