ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 06:42:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: utf8-h: Install header under include/utf8 prefix.

Browse source 
This is to standardize with the usage of the library in the package's only
current user, OpenBoardView.  It also matches the installation layout of the
Arch package, which is made by its author.

* gnu/packages/c.scm (utf8-h) [arguments]: Use gexps.  Adjust installation
prefix to 'include/utf8' in install phase.
* gnu/packages/electronics.scm (openboardview)
[arguments]: Delete fix-utf8-include-directive phase.
This commit is contained in:
Maxim Cournoyer 2023-04-01 17:05:20 -04:00
parent eeffc4ed04
commit 44422c1fba
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/c.scm
View file

@ -1365,8 +1365,9 @@ (define-public utf8-h
"0x9f7ivww8c7cigf4ck0hfx2bm79qgx6q4ccwzqbzkrmcrl9shfb")))) "0x9f7ivww8c7cigf4ck0hfx2bm79qgx6q4ccwzqbzkrmcrl9shfb"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(delete 'build) (delete 'build)
(delete 'configure) (delete 'configure)
(replace 'check (replace 'check
@ -1377,8 +1378,8 @@ (define-public utf8-h
(invoke "make"))))) (invoke "make")))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (install-file "utf8.h"
(install-file "utf8.h" (string-append out "/include")))))))) (string-append #$output "/include/utf8")))))))
(home-page "https://github.com/sheredom/utf8.h") (home-page "https://github.com/sheredom/utf8.h")
(synopsis "Single header UTF-8 string functions for C and C++") (synopsis "Single header UTF-8 string functions for C and C++")
(description "A simple one header solution to supporting UTF-8 strings in (description "A simple one header solution to supporting UTF-8 strings in

8
gnu/packages/electronics.scm
View file

@ -298,14 +298,6 @@ (define keep (list "." ".." "openboardview"))
"add_subdirectory(" "add_subdirectory("
(search-input-directory inputs "share/glad") ;source_dir (search-input-directory inputs "share/glad") ;source_dir
" src/glad)\n"))))) ;binary dir " src/glad)\n"))))) ;binary dir
(add-before 'configure 'fix-utf8-include-directive
;; Our utf8-h package makes the header available as "utf8.h"
;; directly rather than "utf8/utf8.h".
(lambda _
(substitute* '("src/openboardview/FileFormats/BRDFile.cpp"
"src/openboardview/FileFormats/BRDFileBase.cpp"
"src/openboardview/BoardView.cpp")
(("utf8/utf8.h") "utf8.h"))))
(add-before 'configure 'dynamically-load-gtk-via-absolute-path (add-before 'configure 'dynamically-load-gtk-via-absolute-path
;; The GTK library is not linked thus not present in the RUNPATH of ;; The GTK library is not linked thus not present in the RUNPATH of
;; the produced binary; the absolute path of the libraries must to ;; the produced binary; the absolute path of the libraries must to