amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: netpbm: Look for 'gsc' instead of 'gs'.

Browse source 
This is a followup to commit eb354bdacb.

* gnu/packages/netpbm.scm (netpbm)[arguments]: In 'configure' phase,
patch 'pstopnm.c' to look for 'gsc'.
This commit is contained in:
Ludovic Courtès 2016-06-17 15:21:11 +02:00
parent 8956d07a03
commit 61dc82d9b9
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/netpbm.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -114,10 +114,17 @@
(display "ZLIB = libz.so\n" f) (display "ZLIB = libz.so\n" f)
(display (string-append "LDFLAGS += -Wl,-rpath=" %output "/lib") f) (display (string-append "LDFLAGS += -Wl,-rpath=" %output "/lib") f)
(close-port f)) (close-port f))
(let ((rgb (string-append (assoc-ref inputs "xorg-rgb") (let ((rgb (string-append (assoc-ref inputs "xorg-rgb")
"/share/X11/rgb.txt"))) "/share/X11/rgb.txt")))
(substitute* "pm_config.in.h" (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)) #t))
(add-before 'check 'setup-check (add-before 'check 'setup-check
(lambda _ (lambda _