ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: web-browsers: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/web-browsers.scm
(luakit)[inputs]: Add 'bash-minimal'.
(kristall): Delete trailing #t.
[inputs]: Add 'bash-minimal'.
(nyxt)[inputs]: Likewise.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I8106374fc4d208dff19fa12c067772a189b97223
This commit is contained in:
Maxime Devos 2021-07-02 12:06:47 +02:00 committed by Ludovic Courtès
parent d3973ed374
commit 1197e4e999
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/web-browsers.scm
View file

@ -264,7 +264,8 @@ (define-public luakit
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list glib-networking (list bash-minimal
glib-networking
gsettings-desktop-schemas gsettings-desktop-schemas
gtk+ gtk+
lua-5.1 lua-5.1
@ -373,8 +374,7 @@ (define-public kristall
;; Contains executable of 7z and pscp ;; Contains executable of 7z and pscp
(delete-file-recursively "ci/tools") (delete-file-recursively "ci/tools")
;; Remove bundled fonts ;; Remove bundled fonts
(delete-file-recursively "src/fonts") (delete-file-recursively "src/fonts")))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
@ -394,22 +394,21 @@ (define-public kristall
;; Patch it to just return the real version number directly. ;; Patch it to just return the real version number directly.
(substitute* "src/kristall.pro" (substitute* "src/kristall.pro"
(("(KRISTALL_VERSION=).*" _ match) (("(KRISTALL_VERSION=).*" _ match)
(string-append match ,version "\n"))) (string-append match ,version "\n")))))
#t))
(add-before 'build 'dont-use-bundled-cmark (add-before 'build 'dont-use-bundled-cmark
(lambda _ (lambda _
(substitute* "src/kristall.pro" (substitute* "src/kristall.pro"
(("(^include\\(.*cmark.*)" _ match) (("(^include\\(.*cmark.*)" _ match)
(string-append (string-append
"LIBS += -I" (assoc-ref %build-inputs "cmark") " -lcmark"))) "LIBS += -I" (assoc-ref %build-inputs "cmark")
#t)) " -lcmark")))))
(add-before 'build 'dont-use-bundled-breeze-stylesheet (add-before 'build 'dont-use-bundled-breeze-stylesheet
(lambda _ (lambda _
(substitute* "src/kristall.pro" (substitute* "src/kristall.pro"
(("../lib/BreezeStyleSheets/breeze.qrc") (("../lib/BreezeStyleSheets/breeze.qrc")
(string-append (string-append
(assoc-ref %build-inputs "breeze-stylesheet") "/breeze.qrc"))) (assoc-ref %build-inputs "breeze-stylesheet")
#t)) "/breeze.qrc")))))
(add-before 'build 'dont-use-bundled-fonts (add-before 'build 'dont-use-bundled-fonts
(lambda _ (lambda _
(substitute* "src/kristall.pro" (substitute* "src/kristall.pro"
@ -422,8 +421,7 @@ (define-public kristall
(("/fonts/NotoColorEmoji") (("/fonts/NotoColorEmoji")
(string-append (string-append
(assoc-ref %build-inputs "font-google-noto") (assoc-ref %build-inputs "font-google-noto")
"/share/fonts/truetype/NotoColorEmoji"))) "/share/fonts/truetype/NotoColorEmoji")))))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
@ -445,7 +443,8 @@ (define-public kristall
(base32 (base32
"1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294"))))))) "1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294")))))))
(inputs (inputs
(list cmark (list bash-minimal
cmark
font-google-noto font-google-noto
font-openmoji font-openmoji
openssl openssl
@ -617,7 +616,7 @@ (define-public nyxt
(add-before 'build 'fix-common-lisp-cache-folder (add-before 'build 'fix-common-lisp-cache-folder
(lambda _ (setenv "HOME" "/tmp"))) (lambda _ (setenv "HOME" "/tmp")))
(add-before 'check 'configure-tests (add-before 'check 'configure-tests
(lambda _ (setenv "NYXT_TESTS_NO_NETWORK" "1") #t)) (lambda _ (setenv "NYXT_TESTS_NO_NETWORK" "1")))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((bin (string-append (assoc-ref outputs "out") "/bin/nyxt")) (let* ((bin (string-append (assoc-ref outputs "out") "/bin/nyxt"))
@ -641,7 +640,8 @@ (define-public nyxt
`("LD_LIBRARY_PATH" ":" prefix (,path)) `("LD_LIBRARY_PATH" ":" prefix (,path))
`("XDG_DATA_DIRS" ":" prefix (,xdg-path))))))))) `("XDG_DATA_DIRS" ":" prefix (,xdg-path)))))))))
(native-inputs (list cl-lisp-unit2 sbcl)) (native-inputs (list cl-lisp-unit2 sbcl))
(inputs (list sbcl-alexandria (inputs (list bash-minimal
sbcl-alexandria
sbcl-bordeaux-threads sbcl-bordeaux-threads
sbcl-calispel sbcl-calispel
sbcl-cl-base64 sbcl-cl-base64