~ruther/guix-local: gnu: fpc: Fix it, really.

7b15e14a904c732d7c950b8a624904308d5b869f — Maxim Cournoyer 4 years ago 9c6a1d6

gnu: fpc: Fix it, really.

* gnu/packages/pascal.scm (fpc): Inputs are controlled to be package-like
objects, so the previous attempt also failed.
[native-inputs]{fpc-binary}: Backtrack to the original solution, which is to
use the x86_64 bootstrap input for unsupported architectures.

patch browse .tar.gz .zip

1 files changed, 9 insertions(+), 8 deletions(-)

M gnu/packages/pascal.scm

M gnu/packages/pascal.scm => gnu/packages/pascal.scm +9 -8

@@ 93,14 93,15 @@
        ("zlib" ,zlib)))
     (native-inputs
      ;; FPC is built with FPC, so we need bootstrap binaries.
-     `(("fpc-binary"
-        (match ,(or (%current-target-system)
-                    (%current-system))
-          ("i686-linux" ,fpc-bootstrap-i386)
-          ;;("powerpc64le-linux" ,fpc-bootstrap-ppc64le)
-          ;;("powerpc-linux" ,fpc-bootstrap-ppc)
-          ("x86_64-linux" ,fpc-bootstrap-x86_64)
-          (arch (error "fpc arch not yet supported in guix" arch))))))
+     `(("fpc-binary" ,(match (or (%current-target-system)
+                                 (%current-system))
+                       ("i686-linux" fpc-bootstrap-i386)
+                       ;;("powerpc64le-linux" fpc-bootstrap-ppc64le)
+                       ;;("powerpc-linux" fpc-bootstrap-ppc)
+                       ("x86_64-linux" fpc-bootstrap-x86_64)
+                       ;; XXX: Wrong, but innocuous so long
+                       ;; `supported-systems' is kept in sync.
+                       (_ fpc-bootstrap-x86_64)))))
     (arguments
      `(#:tests? #f ; no tests available
        #:phases