summary refs log tree commit diff
diff options
context:
space:
mode:
authorFederico Beffa <beffa@fbengineering.ch>2016-05-13 20:39:20 +0200
committerFederico Beffa <beffa@fbengineering.ch>2016-05-16 14:23:46 +0200
commit2492581f0c7a77db5e7da231a62aa09cfaed0987 (patch)
tree15f476ca2462870dcf57d1b623c2a419f2cca005
parent1de1c56db72a48c38ad12990e32319eb51b29795 (diff)
downloadguix-2492581f0c7a77db5e7da231a62aa09cfaed0987.tar.gz
gnu: netpbm: Fix location of X color name database.
* 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.
-rw-r--r--gnu/packages/netpbm.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm
index d7d857642e..d0955fe80a 100644
--- a/gnu/packages/netpbm.scm
+++ b/gnu/packages/netpbm.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
   #:use-module (guix build-system gnu)
   #:use-module ((guix licenses) #:select (gpl2))
   #:use-module (guix packages)
@@ -91,6 +92,7 @@
              ("libpng" ,libpng)
              ("libtiff" ,libtiff)
              ("libxml2" ,libxml2)
+             ("xorg-rgb" ,xorg-rgb)
              ("zlib" ,zlib)))
    (native-inputs
      `(("flex" ,flex)
@@ -111,7 +113,11 @@
              (display "JPEGLIB = libjpeg.so\n" f)
              (display "ZLIB = libz.so\n" 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
          (lambda _
            ;; install temporarily into /tmp/netpbm