From f4c901decb414681256b3d0278678a2a4c853b56 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 13 Apr 2016 10:41:57 -0400 Subject: [PATCH] gnu: geda-gaf: Make gsch2pcb work out-of-the-box. * gnu/packages/engineering.scm (geda-gaf)[inputs]: Add m4 and pcb. [arguments]: Add configure flags that point to PCB data files. --- gnu/packages/engineering.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9a36ffb..9a299d9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 David Thompson ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages linux) ;FIXME: for pcb + #:use-module (gnu packages m4) #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -124,13 +126,22 @@ plans and designs.") 'check 'set-home (lambda _ (setenv "HOME" (getenv "TMPDIR"))) - %standard-phases))) + %standard-phases + ) + #:configure-flags + (let ((pcb (assoc-ref %build-inputs "pcb"))) + (list (string-append "--with-pcb-datadir=" pcb "/share") + (string-append "--with-pcb-lib-path=" + pcb "/share/pcb/pcblib-newlib:" + pcb "/share/pcb/newlib"))))) (inputs `(("glib" ,glib) ("gtk" ,gtk+-2) ("guile" ,guile-2.0) ("desktop-file-utils" ,desktop-file-utils) - ("shared-mime-info" ,shared-mime-info))) + ("shared-mime-info" ,shared-mime-info) + ("m4" ,m4) + ("pcb" ,pcb))) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) ; for tests -- 2.7.3