1 files changed, 20 insertions(+), 22 deletions(-)

M gnu/packages/engineering.scm

@@ 2400,31 2400,29 @@ parallel computing platforms.  It also supports serial execution.")
        (prepend openmpi)))))
 
 (define-public xyce-parallel
-  (package (inherit xyce-serial)
+  (package
+    (inherit xyce-serial)
     (name "xyce-parallel")
     (arguments
-     `(,@(substitute-keyword-arguments (package-arguments xyce-serial)
-           ((#:configure-flags flags)
-            `(list "CXXFLAGS=-O3"
-                   "CXX=mpiCC"
-                   "CC=mpicc"
-                   "F77=mpif77"
-                   "--enable-mpi"
-                   (string-append
-                           "CFLAGS="
-                           " -Wno-error=builtin-declaration-mismatch"
-                           " -Wno-error=implicit-function-declaration"
-                           " -Wno-error=implicit-int")
-                   (string-append
-                    "ARCHDIR="
-                    (assoc-ref %build-inputs "trilinos")))))))
-    (propagated-inputs
-     `(("mpi" ,openmpi)))
+     (substitute-keyword-arguments
+         (package-arguments xyce-serial)
+       ((#:configure-flags flags)
+        #~(list "CXXFLAGS=-O3"
+                "CXX=mpiCC"
+                "CC=mpicc"
+                "F77=mpif77"
+                "--enable-mpi"
+                (string-append
+                 "CFLAGS="
+                 " -Wno-error=builtin-declaration-mismatch"
+                 " -Wno-error=implicit-function-declaration"
+                 " -Wno-error=implicit-int")
+                (string-append "ARCHDIR=" #$trilinos-parallel-xyce)))))
+    (propagated-inputs (list openmpi))
     (inputs
-     `(("trilinos" ,trilinos-parallel-xyce)
-       ("zlib" ,zlib)
-       ,@(alist-delete "trilinos"
-                       (package-inputs xyce-serial))))))
+     (modify-inputs (package-inputs xyce-serial)
+       (append zlib)
+       (replace "trilinos-serial-xyce" trilinos-parallel-xyce)))))
 
 (define-public librepcb
   (package