diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-17 15:21:11 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-17 15:21:11 +0200 |
| commit | 61dc82d9b90d0545739c30bfc33003bd062071f0 (patch) | |
| tree | 32427890be4dfbefa6299bed2d4a697893b6086a /gnu/packages/netpbm.scm | |
| parent | 8956d07a03f7c909680d9882498ee3dd7e9a32eb (diff) | |
| download | guix-61dc82d9b90d0545739c30bfc33003bd062071f0.tar.gz | |
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'.
Diffstat (limited to 'gnu/packages/netpbm.scm')
| -rw-r--r-- | gnu/packages/netpbm.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index e2d409abe2..20ca87b4f1 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 <andreas@enge.fr> -;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; ;;; 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 _ |