futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: ungoogled-chromium-wayland: Use gexp.

Browse Source 
* gnu/packages/chromium.scm (ungoogled-chromium-wayland): Use gexp.
[arguments](builder): Use gexp.
[inputs]: Rewrite inputs.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Nicolas Graves 2023-08-31 19:23:54 +02:00 committed by Maxim Cournoyer
parent 6548efcd73
commit c83c0a0093
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/chromium.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2019-2023 Marius Bakke <marius@gnu.org> ;;; Copyright © 2019-2023 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2023 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -966,20 +967,18 @@ testing.")
(name "ungoogled-chromium-wayland") (name "ungoogled-chromium-wayland")
(native-inputs '()) (native-inputs '())
(inputs (inputs
`(("bash" ,bash-minimal) (list bash-minimal glibc-utf8-locales ungoogled-chromium))
("glibc-locales" ,glibc-utf8-locales)
("ungoogled-chromium" ,ungoogled-chromium)))
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
'(#:modules ((guix build utils)) (list
#:modules '((guix build utils))
#:builder #:builder
(begin #~(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
(let* ((bash (assoc-ref %build-inputs "bash")) (let* ((bash #$(this-package-input "bash-minimal"))
(chromium (assoc-ref %build-inputs "ungoogled-chromium")) (chromium #$(this-package-input "ungoogled-chromium"))
(locales (assoc-ref %build-inputs "glibc-locales")) (locales #$(this-package-input "glibc-utf8-locales"))
(out (assoc-ref %outputs "out")) (exe (string-append #$output "/bin/chromium")))
(exe (string-append out "/bin/chromium")))
;; Use a Unicode locale so we can substitute the file below. ;; Use a Unicode locale so we can substitute the file below.
(setenv "GUIX_LOCPATH" (string-append locales "/lib/locale")) (setenv "GUIX_LOCPATH" (string-append locales "/lib/locale"))
@ -987,7 +986,7 @@ testing.")
(mkdir-p (dirname exe)) (mkdir-p (dirname exe))
(symlink (string-append chromium "/bin/chromedriver") (symlink (string-append chromium "/bin/chromedriver")
(string-append out "/bin/chromedriver")) (string-append #$output "/bin/chromedriver"))
(call-with-output-file exe (call-with-output-file exe
(lambda (port) (lambda (port)
@ -1000,8 +999,7 @@ exec ~a --enable-features=UseOzonePlatform --ozone-platform=wayland \
;; Provide the manual and .desktop file. ;; Provide the manual and .desktop file.
(copy-recursively (string-append chromium "/share") (copy-recursively (string-append chromium "/share")
(string-append out "/share")) (string-append #$output "/share"))
(substitute* (string-append (substitute* (string-append
out "/share/applications/chromium.desktop") #$output "/share/applications/chromium.desktop")
((chromium) out)) ((chromium) #$output))))))))
#t))))))