Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-11-25 09:58:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: firefox: Use Gexp.

Browse source 
* nongnu/packages/mozilla.scm (firefox)[arguments]: Use Gexp to remove uses of
%BUILD-INPUTS and output references.  Also remove trailing #t.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Ricardo Wurmus 2022-02-13 18:04:22 +01:00 committed by Jonathan Brielmaier
parent 8a545a72d7
commit b5a8492a79
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F
1 changed files with 238 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
nongnu/packages/mozilla.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2017, 2018 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018 ng0 <gillmann@infotropique.org>
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2020, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
@ -42,6 +42,7 @@
#:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix utils)
@ -100,10 +101,10 @@
(base32 "0a6z94kwgycgis4mgl13dh52kw7zmsya2qpxhcrh6b8j8z5pv2kc"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(let ((clang (assoc-ref %build-inputs "clang"))
(wasi-sysroot (assoc-ref %build-inputs
"wasm32-wasi-clang-toolchain")))
(list
#:configure-flags
#~(let ((clang #$(this-package-native-input "clang"))
(wasi-sysroot #$(this-package-native-input "wasm32-wasi-clang-toolchain")))
`("--enable-application=browser"
;; Configuration
@ -142,13 +143,13 @@
"--enable-optimize"
"--enable-strip"
"--disable-elf-hack"))
#:imported-modules ,%cargo-utils-modules
#:modules ((ice-9 regex)
#:imported-modules %cargo-utils-modules
#:modules `((ice-9 regex)
(ice-9 ftw)
(srfi srfi-26)
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-preferences
(lambda* (#:key inputs #:allow-other-keys)
(let ((port (open-file "browser/app/profile/firefox.js" "a")))
@ -165,8 +166,7 @@
;; XDG settings should be managed by Guix.
(write-setting "browser.shell.checkDefaultBrowser" "false")
(close-port port))
#t))
(close-port port))))
(add-after 'fix-preferences 'fix-ffmpeg-runtime-linker
(lambda* (#:key inputs #:allow-other-keys)
(let* ((ffmpeg (assoc-ref inputs "ffmpeg"))
@ -174,8 +174,7 @@
;; Arrange to load libavcodec.so by its absolute file name.
(substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp"
(("libavcodec\\.so")
libavcodec))
#t)))
libavcodec)))))
(add-after 'patch-source-shebangs 'patch-cargo-checksums
(lambda _
@ -209,16 +208,14 @@
"third_party/rust"
"toolkit"
"xpcom/rust"
"services"))
#t)))
"services")))))
(add-after 'patch-cargo-checksums 'remove-cargo-frozen-flag
(lambda _
;; Remove --frozen flag from cargo invokation, otherwise it'll
;; complain that it's not able to change Cargo.lock.
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373
(substitute* "build/RunCbindgen.py"
(("\"--frozen\",") ""))
#t))
(("\"--frozen\",") ""))))
(delete 'bootstrap)
(replace 'configure
(lambda* (#:key inputs outputs configure-flags #:allow-other-keys)
@ -245,7 +242,7 @@
(setenv "MOZ_NOSPAM" "1")
;; Firefox will write the timestamp to output, which is harmful for
;; reproducibility, so change it to a fixed date.
(setenv "MOZ_BUILD_DATE" ,%firefox-build-id)
(setenv "MOZ_BUILD_DATE" #$%firefox-build-id)
(setenv "MOZBUILD_STATE_PATH" (getcwd))
@ -297,8 +294,7 @@
(string-append store
(string-take hash 8)
"<!-- Guix: not a runtime dependency -->"
(string-drop hash 8)))))
#t))
(string-drop hash 8)))))))
(replace 'install
(lambda _ (invoke "./mach" "install")))
(add-after 'install 'wrap-program
@ -321,38 +317,33 @@
`("LD_LIBRARY_PATH" prefix ,ld-libs)
`("XDG_DATA_DIRS" prefix (,gtk-share))
`("MOZ_LEGACY_PROFILES" = ("1"))
`("MOZ_ALLOW_DOWNGRADE" = ("1")))
#t)))
`("MOZ_ALLOW_DOWNGRADE" = ("1"))))))
(add-after 'wrap-program 'install-desktop-entry
(lambda* (#:key outputs #:allow-other-keys)
(let* ((desktop-file "taskcluster/docker/firefox-snap/firefox.desktop")
(out (assoc-ref outputs "out"))
(applications (string-append out "/share/applications")))
(applications (string-append #$output "/share/applications")))
(substitute* desktop-file
(("^Exec=firefox") (string-append "Exec=" out "/bin/firefox"))
(("^Exec=firefox") (string-append "Exec=" #$output "/bin/firefox"))
(("Icon=.*") "Icon=firefox\n")
(("NewWindow") "new-window")
(("NewPrivateWindow") "new-private-window")
(("StartupNotify=true")
"StartupNotify=true\nStartupWMClass=Navigator"))
(install-file desktop-file applications))
#t))
(install-file desktop-file applications))))
(add-after 'install-desktop-entry 'install-icons
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(icon-source-dir
(let ((icon-source-dir
(string-append
out "/lib/firefox/browser/chrome/icons/default")))
#$output "/lib/firefox/browser/chrome/icons/default")))
(for-each
(lambda (size)
(let ((dest (string-append out "/share/icons/hicolor/"
(let ((dest (string-append #$output "/share/icons/hicolor/"
size "x" size "/apps")))
(mkdir-p dest)
(symlink (string-append icon-source-dir
"/default" size ".png")
(string-append dest "/firefox.png"))))
'("16" "32" "48" "64" "128"))
#t))))
'("16" "32" "48" "64" "128"))))))
;; Test will significantly increase build time but with little rewards.
#:tests? #f