ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: netpbm: Fix location of X color name database.

Browse source 
* gnu/packages/netpbm.scm (netpbm)[inputs]: Add 'xorg-rgb'.
  [arguments]: In the 'configure' phase, patch 'pm_config.in.h' with the full
  path to the 'rgb.txt' file.
This commit is contained in:
Federico Beffa 2016-05-13 20:39:20 +02:00
parent 1de1c56db7
commit 2492581f0c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/netpbm.scm
View file

@ -27,6 +27,7 @@ (define-module (gnu packages netpbm)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:select (gpl2)) #:use-module ((guix licenses) #:select (gpl2))
#:use-module (guix packages) #:use-module (guix packages)
@ -91,6 +92,7 @@ (define-syntax drop
("libpng" ,libpng) ("libpng" ,libpng)
("libtiff" ,libtiff) ("libtiff" ,libtiff)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("xorg-rgb" ,xorg-rgb)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("flex" ,flex) `(("flex" ,flex)
@ -111,7 +113,11 @@ (define-syntax drop
(display "JPEGLIB = libjpeg.so\n" f) (display "JPEGLIB = libjpeg.so\n" f)
(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")
"/share/X11/rgb.txt")))
(substitute* "pm_config.in.h"
(("/usr/share/X11/rgb.txt") rgb)))))
(add-before 'check 'setup-check (add-before 'check 'setup-check
(lambda _ (lambda _
;; install temporarily into /tmp/netpbm ;; install temporarily into /tmp/netpbm