gnu: open-logic: Fix library instantiation.

The output of this package is to be used as the instantiation library
from its dependent upstream. The search patch labels as a firmware
package.

* gnu/packages/electronics.scm (open-logic)[outputs]: Rename.
[properties]: Update accordingly.
[arguments]: Update #:install-plan.
[native-search-paths]: Update ’variable.

Change-Id: I814f561cb5be7c90fdc3fa0f4a8bc6f6a57bc992

1 files changed, 14 insertions, 7 deletions

diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index e95f0c1560e..2848108875f 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -2040,10 +2040,10 @@ verification.")
         (base32
          "1792a6i9jq2yawipmk0nr01z092kx3kkav9v5sjf34khk3biav6q"))))
     (outputs
-     '("out" "test"))
+     '("out" "olo"))
     (properties
-     `((output-synopsis "test" "Testing code")
-       (output-synopsis "out" "Source code")))
+     `((output-synopsis "out" "Instance this design library as work")
+       (output-synopsis "olo" "Instance this design library as olo")))
     (build-system copy-build-system)
     (arguments
      (list
@@ -2064,14 +2064,21 @@ verification.")
                      ""))
                   (invoke "python3" "run.py" "--nvc" "-v"))))))
       #:install-plan
-      #~'(("src" "share/open-logic/src" #:exclude-regexp ("core"))
-          ("3rdParty" "share/open-logic/3rdParty")
-          ("test" "share/open-logic/test" #:output "test"))))
+      #~'(;; Library work.
+          ("src" "share/open-logic/work/src"
+           #:include ("vhd"))
+          ("3rdParty" "share/open-logic/work/3rdParty"
+           #:include ("vhd"))
+          ;; Library olo.
+          ("src" "share/open-logic/olo/src"
+           #:include ("vhd") #:output "olo")
+          ("3rdParty" "share/open-logic/olo/3rdParty"
+           #:include ("vhd") #:output "olo"))))
     (native-inputs
      (list nvc python-matplotlib python-minimal python-vunit))
     (native-search-paths
      (list (search-path-specification
-             (variable "OPEN_LOGIC")
+             (variable "FW_OPEN_LOGIC")
              (separator #f)
              (files (list "share/open-logic")))))
     (home-page "https://github.com/open-logic/open-logic/")