ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-18 04:37:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: unicorn: Use python-build-system with grace.

Browse source 
* gnu/packages/emulators.scm (unicorn)[arguments]: Remove the
  install-bindings-to-python-output phase. Adjust output names used in
  other phases.
This commit is contained in:
Jakub Kądziołka 2020-06-21 03:18:55 +02:00
parent 849f6e0ff9
commit 352e6c8a75
No known key found for this signature in database
GPG key ID: E315A75846131564
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/emulators.scm
View file

@ -1700,17 +1700,6 @@ (define-public unicorn
(guix build utils)) (guix build utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'install-bindings-to-python-output
(lambda* (#:key outputs #:allow-other-keys)
;; python-build-system will build the bindings and install them to
;; the "out" output, so change the build-internal names of the
;; outputs.
;;
;; TODO: remove this once #40469 lands, through the core-updates
;; holding zone, on master.
(set-car! (assoc "out" outputs) "lib")
(set-car! (assoc "python" outputs) "out")
#t))
(add-before 'build 'build-library (add-before 'build 'build-library
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(invoke "make" (invoke "make"
@ -1723,7 +1712,7 @@ (define-public unicorn
"UNICORN_STATIC=no" "UNICORN_STATIC=no"
(string-append (string-append
"PREFIX=" "PREFIX="
(assoc-ref outputs "lib"))))) (assoc-ref outputs "out")))))
(add-before 'build 'prepare-bindings (add-before 'build 'prepare-bindings
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(chdir "bindings/python") (chdir "bindings/python")
@ -1736,7 +1725,7 @@ (define-public unicorn
(("_path_list = \\[.*") (("_path_list = \\[.*")
(string-append (string-append
"_path_list = [\"" "_path_list = [\""
(assoc-ref outputs "lib") (assoc-ref outputs "out")
;; eat the rest of the list ;; eat the rest of the list
"/lib\"] + 0*["))) "/lib\"] + 0*[")))
#t)) #t))
@ -1757,10 +1746,10 @@ (define-public unicorn
(let* ((python-samples (find-files "." "sample_.*")) (let* ((python-samples (find-files "." "sample_.*"))
(c-samples (find-files "../../samples" ".*\\.c")) (c-samples (find-files "../../samples" ".*\\.c"))
(python-docdir (python-docdir
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "python")
"/share/doc/unicorn/samples")) "/share/doc/unicorn/samples"))
(c-docdir (c-docdir
(string-append (assoc-ref outputs "lib") (string-append (assoc-ref outputs "out")
"/share/doc/unicorn/samples"))) "/share/doc/unicorn/samples")))
(for-each (cut install-file <> c-docdir) c-samples) (for-each (cut install-file <> c-docdir) c-samples)
(for-each (cut install-file <> python-docdir) python-samples) (for-each (cut install-file <> python-docdir) python-samples)