me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ungoogled-chromium: Remove input labels.

Browse source 
* gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-FILE & co as appropriate.
This commit is contained in:
Marius Bakke 2022-01-09 17:07:09 +01:00
parent 1b87dc2f2a
commit 23adb414fd
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 77 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

159
gnu/packages/chromium.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020, 2021 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020, 2021, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -543,8 +543,9 @@
"use_system_libpng=true" "use_system_libpng=true"
"use_system_wayland_scanner=true" "use_system_wayland_scanner=true"
(string-append "system_wayland_scanner_path=\"" (string-append "system_wayland_scanner_path=\""
(assoc-ref %build-inputs "wayland-scanner") (search-input-file %build-inputs
"/bin/wayland-scanner\"") "/bin/wayland-scanner")
"\"")
"use_system_zlib=true" "use_system_zlib=true"
"use_gnome_keyring=false" ;deprecated by libsecret "use_gnome_keyring=false" ;deprecated by libsecret
@ -586,11 +587,11 @@
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-stuff (add-after 'unpack 'patch-stuff
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((openjpeg (assoc-ref inputs "openjpeg"))) (let ((openjpeg (search-input-directory
inputs "include/openjpeg-2.4")))
(substitute* "third_party/pdfium/BUILD.gn" (substitute* "third_party/pdfium/BUILD.gn"
;; This include path is added by Debians openjpeg patch. ;; This include path is added by Debians openjpeg patch.
(("/usr/include/openjpeg") (("/usr/include/openjpeg-2.4") openjpeg)))
(string-append openjpeg "/include/openjpeg"))))
(substitute* (substitute*
'("base/process/launch_posix.cc" '("base/process/launch_posix.cc"
@ -651,36 +652,31 @@
(("include/third_party/vulkan/") "")))) (("include/third_party/vulkan/") ""))))
(add-after 'patch-stuff 'add-absolute-references (add-after 'patch-stuff 'add-absolute-references
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((cups (assoc-ref inputs "cups")) (let ((cups-config (search-input-file inputs "/bin/cups-config"))
(nss (assoc-ref inputs "nss")) (libnssckbi.so (search-input-file inputs "/lib/nss/libnssckbi.so"))
(mesa (assoc-ref inputs "mesa")) (libudev.so.1 (search-input-file inputs "/lib/libudev.so.1"))
(udev (assoc-ref inputs "udev"))) (libvulkan.so.1 (search-input-file inputs "/lib/libvulkan.so.1"))
(mesa-lib (dirname (search-input-file inputs "/lib/libGL.so.1"))))
(substitute* "printing/cups_config_helper.py" (substitute* "printing/cups_config_helper.py"
(("cups_config =.*") (("cups_config =.*")
(string-append "cups_config = '" cups (string-append "cups_config = '" cups-config "'\n")))
"/bin/cups-config'\n")))
(substitute* "crypto/nss_util.cc" (substitute* "crypto/nss_util.cc"
(("libnssckbi\\.so") (("libnssckbi\\.so") libnssckbi.so))
(string-append nss "/lib/nss/libnssckbi.so")))
(substitute* "device/udev_linux/udev1_loader.cc" (substitute* "device/udev_linux/udev1_loader.cc"
(("libudev\\.so\\.1") (("libudev\\.so\\.1") libudev.so.1))
(string-append udev "/lib/libudev.so.1")))
(substitute* "third_party/dawn/src/dawn_native/vulkan/BackendVk.cpp" (substitute* "third_party/dawn/src/dawn_native/vulkan/BackendVk.cpp"
(("libvulkan\\.so\\.1") (("libvulkan\\.so\\.1") libvulkan.so.1))
(search-input-file inputs "/lib/libvulkan.so.1")))
(substitute* (substitute*
'("ui/ozone/platform/x11/gl_ozone_glx.cc" '("ui/ozone/platform/x11/gl_ozone_glx.cc"
"ui/ozone/common/egl_util.cc" "ui/ozone/common/egl_util.cc"
"ui/gl/init/gl_initializer_linux_x11.cc" "ui/gl/init/gl_initializer_linux_x11.cc"
"third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp") "third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp")
(("libGL\\.so\\.1") (("libGL\\.so\\.1")
(string-append mesa "/lib/libGL.so.1")) (string-append mesa-lib "/libGL.so.1"))
(("libEGL\\.so\\.1") (("libEGL\\.so\\.1")
(string-append mesa "/lib/libEGL.so.1")) (string-append mesa-lib "/libEGL.so.1"))
(("libGLESv2\\.so\\.2") (("libGLESv2\\.so\\.2")
(string-append mesa "/lib/libGLESv2.so.2")))))) (string-append mesa-lib "/libGLESv2.so.2"))))))
(add-before 'configure 'prepare-build-environment (add-before 'configure 'prepare-build-environment
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -716,7 +712,7 @@
;; XXX: How portable is this. ;; XXX: How portable is this.
(mkdir-p "third_party/node/linux/node-linux-x64") (mkdir-p "third_party/node/linux/node-linux-x64")
(symlink (string-append (assoc-ref inputs "node") "/bin") (symlink (dirname (search-input-file inputs "/bin/node"))
"third_party/node/linux/node-linux-x64/bin"))) "third_party/node/linux/node-linux-x64/bin")))
(replace 'configure (replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys) (lambda* (#:key configure-flags #:allow-other-keys)
@ -778,8 +774,7 @@
(resources (string-append lib "/resources")) (resources (string-append lib "/resources"))
(preferences (assoc-ref inputs "master-preferences")) (preferences (assoc-ref inputs "master-preferences"))
(gtk+ (assoc-ref inputs "gtk+")) (gtk+ (assoc-ref inputs "gtk+"))
(xdg-utils (assoc-ref inputs "xdg-utils")) (xdg-utils (assoc-ref inputs "xdg-utils")))
(sh (which "sh")))
(substitute* '("chrome/app/resources/manpage.1.in" (substitute* '("chrome/app/resources/manpage.1.in"
"chrome/installer/linux/common/desktop.template") "chrome/installer/linux/common/desktop.template")
@ -846,62 +841,62 @@
("python" ,python-wrapper) ("python" ,python-wrapper)
("wayland-scanner" ,wayland))) ("wayland-scanner" ,wayland)))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) (list alsa-lib
("atk" ,atk) atk
("cups" ,cups) cups
("curl" ,curl) curl
("dbus" ,dbus) dbus
("expat" ,expat) expat
("flac" ,flac) flac
("ffmpeg" ,ffmpeg) ffmpeg
("fontconfig" ,fontconfig) fontconfig
("freetype" ,freetype) freetype
("gdk-pixbuf" ,gdk-pixbuf) gdk-pixbuf
("glib" ,glib) glib
("gtk+" ,gtk+) gtk+
("harfbuzz" ,harfbuzz-3.0) harfbuzz-3.0
("icu4c" ,icu4c) icu4c
("lcms" ,lcms) lcms
("libevent" ,libevent) libevent
("libffi" ,libffi) libffi
("libjpeg-turbo" ,libjpeg-turbo) libjpeg-turbo
("libpng" ,libpng) libpng
("libva" ,libva) libva
("libvpx" ,libvpx) libvpx
("libwebp" ,libwebp) libwebp
("libx11" ,libx11) libx11
("libxcb" ,libxcb) libxcb
("libxcomposite" ,libxcomposite) libxcomposite
("libxcursor" ,libxcursor) libxcursor
("libxdamage" ,libxdamage) libxdamage
("libxext" ,libxext) libxext
("libxfixes" ,libxfixes) libxfixes
("libxi" ,libxi) libxi
("libxml2" ,libxml2) libxml2
("libxrandr" ,libxrandr) libxrandr
("libxrender" ,libxrender) libxrender
("libxscrnsaver" ,libxscrnsaver) libxscrnsaver
("libxslt" ,libxslt) libxslt
("libxtst" ,libxtst) libxtst
("mesa" ,mesa) mesa
("minizip" ,minizip) minizip
("mit-krb5" ,mit-krb5) mit-krb5
("nss" ,nss) nss
("openh264" ,openh264) openh264
("openjpeg" ,openjpeg) ;PDFium only openjpeg ;PDFium only
("opus" ,opus+custom) opus+custom
("pango" ,pango) pango
("pciutils" ,pciutils) pciutils
("pipewire" ,pipewire-0.3) pipewire-0.3
("pulseaudio" ,pulseaudio) pulseaudio
("snappy" ,snappy) snappy
("speech-dispatcher" ,speech-dispatcher) speech-dispatcher
("udev" ,eudev) eudev
("valgrind" ,valgrind) valgrind
("vulkan-headers" ,vulkan-headers) vulkan-headers
("vulkan-loader" ,vulkan-loader) vulkan-loader
("wayland" ,wayland) wayland
("xdg-utils" ,xdg-utils))) xdg-utils))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "CHROMIUM_EXTENSION_DIRECTORY") (variable "CHROMIUM_EXTENSION_DIRECTORY")