gnu: ungoogled-chromium: Add native Wayland variant.

* gnu/packages/chromium.scm (%preserved-third-party-files): Preserve
"third_party/wayland/wayland_scanner_wrapper.py" and "third_party/wayland-protocols".
(ungoogled-chromium/wayland): New public variable.
This commit is contained in:
Marius Bakke 2019-07-17 16:30:23 +02:00
parent 243c523946
commit 82ccfb1d94
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -36,6 +36,7 @@ (define-module (gnu packages chromium)
#:use-module (gnu packages cups) #:use-module (gnu packages cups)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
@ -68,7 +69,8 @@ (define-module (gnu packages chromium)
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg)
#:use-module (srfi srfi-1))
(define %preserved-third-party-files (define %preserved-third-party-files
'("base/third_party/dmg_fp" ;X11-style '("base/third_party/dmg_fp" ;X11-style
@ -191,6 +193,8 @@ (define %preserved-third-party-files
"third_party/ungoogled" ;BSD-3 "third_party/ungoogled" ;BSD-3
"third_party/usb_ids" ;BSD-3 "third_party/usb_ids" ;BSD-3
"third_party/usrsctp" ;BSD-2 "third_party/usrsctp" ;BSD-2
"third_party/wayland/wayland_scanner_wrapper.py" ;BSD-3
"third_party/wayland-protocols" ;Expat
"third_party/web-animations-js" ;ASL2.0 "third_party/web-animations-js" ;ASL2.0
"third_party/webdriver" ;ASL2.0 "third_party/webdriver" ;ASL2.0
"third_party/webrtc" ;BSD-3 "third_party/webrtc" ;BSD-3
@ -781,3 +785,30 @@ (define-public ungoogled-chromium
(license:non-copyleft "chrome://credits" (license:non-copyleft "chrome://credits"
"See chrome://credits for more information.") "See chrome://credits for more information.")
license:lgpl2.1+)))) license:lgpl2.1+))))
(define-public ungoogled-chromium/wayland
(package/inherit ungoogled-chromium
(name "ungoogled-chromium-wayland")
(inputs
`(("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)
;; Remove inputs only needed for X11.
,@(fold alist-delete (package-inputs ungoogled-chromium)
'("libx11" "libxcb" "libxcomposite" "libxcursor"
"libxdamage" "libxext" "libxfixes" "libxi"
"libxrender" "libxtst" "libxext" "libxrandr"
"libxscrnsaver"))))
(arguments
(substitute-keyword-arguments (package-arguments ungoogled-chromium)
((#:configure-flags flags)
`(append (list "use_ozone=true"
"ozone_platform_wayland=true"
"ozone_auto_platforms=false"
"use_xkbcommon=true"
"use_system_minigbm=true"
"use_system_libwayland=true"
(string-append "system_wayland_scanner_path=\""
(assoc-ref %build-inputs "wayland")
"/bin/wayland-scanner\""))
(delete "use_vaapi=true" ,flags)))))))