[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: gimp-fourier: Fix build.
From: |
Ricardo Wurmus |
Subject: |
01/01: gnu: gimp-fourier: Fix build. |
Date: |
Wed, 23 May 2018 04:08:39 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit b2086776f1466cdb8096eec0b75a52fcf169d7cd
Author: Ricardo Wurmus <address@hidden>
Date: Wed May 23 09:53:08 2018 +0200
gnu: gimp-fourier: Fix build.
* gnu/packages/gimp.scm (gimp-fourier)[arguments]: Copy gegl-0.4.pc to
gegl-0.3.pc in the configure phase.
[inputs]: Add gegl.
---
gnu/packages/gimp.scm | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index f2e020b..08b2d2a 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Ludovic Courtès <address@hidden>
-;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2016, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Leo Famulari <address@hidden>
@@ -196,7 +196,18 @@ that is extensible via a plugin system.")
`(#:tests? #f ;no tests
#:phases
(modify-phases %standard-phases
- (delete 'configure)
+ ;; FIXME: The gegl package only installs "gegl-0.4.pc", but
+ ;; "gimp-2.0.pc" requires "gegl-0.3.pc", so we just copy it.
+ (replace 'configure
+ (lambda* (#:key inputs #:allow-other-keys)
+ (mkdir-p "tmppkgconfig")
+ (copy-file (string-append (assoc-ref inputs "gegl")
+ "/lib/pkgconfig/gegl-0.4.pc")
+ "tmppkgconfig/gegl-0.3.pc")
+ (setenv "PKG_CONFIG_PATH"
+ (string-append "tmppkgconfig:"
+ (or (getenv "PKG_CONFIG_PATH") "")))
+ #t))
(add-after 'unpack 'set-prefix
(lambda* (#:key outputs #:allow-other-keys)
;; gimptool-2.0 does not allow us to install to any target
@@ -215,6 +226,7 @@ that is extensible via a plugin system.")
("gimp" ,gimp)
;; needed by gimp-2.0.pc
("gdk-pixbuf" ,gdk-pixbuf)
+ ("gegl" ,gegl)
("cairo" ,cairo)
("glib" ,glib)
;; needed by gimpui-2.0.pc