me/guix
Archived
1
0
Fork 0
Code Activity

gnu: icedove: Use gexps.

Browse source 
* gnu/packages/gnuzilla.scm (icedove) [arguments]: Use gexps, adjusting phases
as needed.
This commit is contained in:
Maxim Cournoyer 2022-10-10 20:17:04 -04:00
parent f81abf3898
commit 64e8ed1061
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 209 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gnu/packages/gnuzilla.scm
View file

@ -1250,14 +1250,15 @@ standards of the IceCat project.")
`((cpe-name . "thunderbird_esr"))) `((cpe-name . "thunderbird_esr")))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target (list
#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' #:tests? #f ;no check target
#:modules ((guix build utils) ;find-files #:imported-modules %cargo-utils-modules ;for `generate-all-checksums'
#:modules `((guix build utils) ;find-files
(sxml simple) (sxml simple)
(ice-9 regex) (ice-9 regex)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'prepare-thunderbird-sources (add-after 'unpack 'prepare-thunderbird-sources
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(mkdir "comm") (mkdir "comm")
@ -1267,7 +1268,8 @@ standards of the IceCat project.")
(add-after 'patch-source-shebangs 'patch-cargo-checksums (add-after 'patch-source-shebangs 'patch-cargo-checksums
(lambda _ (lambda _
(use-modules (guix build cargo-utils)) (use-modules (guix build cargo-utils))
(let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934\
ca495991b7852b855"))
(for-each (lambda (file) (for-each (lambda (file)
(format #t "patching checksums in ~a~%" file) (format #t "patching checksums in ~a~%" file)
(substitute* file (substitute* file
@ -1284,8 +1286,9 @@ standards of the IceCat project.")
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373 ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373
(substitute* "build/RunCbindgen.py" (substitute* "build/RunCbindgen.py"
(("\"--frozen\",") "")))) (("\"--frozen\",") ""))))
;; Fixes issue where each installation directory generates its own profile. ;; Fixes issue where each installation directory generates its own
;; See e.g. https://trac.torproject.org/projects/tor/ticket/31457 ;; profile (see:
;; https://trac.torproject.org/projects/tor/ticket/31457).
(add-after 'patch-source-shebangs 'fix-profile-setting (add-after 'patch-source-shebangs 'fix-profile-setting
(lambda _ (lambda _
(substitute* "comm/mail/moz.configure" (substitute* "comm/mail/moz.configure"
@ -1372,12 +1375,11 @@ standards of the IceCat project.")
(string-drop hash 8)))))) (string-drop hash 8))))))
(delete 'bootstrap) (delete 'bootstrap)
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs configure-flags #:allow-other-keys) (lambda* (#:key inputs configure-flags #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((bash (which "bash"))
(bash (which "bash"))
(abs-srcdir (getcwd)) (abs-srcdir (getcwd))
(srcdir (string-append "../" (basename abs-srcdir))) (srcdir (string-append "../" (basename abs-srcdir)))
(flags `(,(string-append "--prefix=" out) (flags `(,(string-append "--prefix=" #$output)
,@configure-flags)) ,@configure-flags))
(mozconfig (string-append (getcwd) "/.mozconfig"))) (mozconfig (string-append (getcwd) "/.mozconfig")))
(setenv "SHELL" bash) (setenv "SHELL" bash)
@ -1397,10 +1399,9 @@ standards of the IceCat project.")
(setenv "MACH_USE_SYSTEM_PYTHON" "1") (setenv "MACH_USE_SYSTEM_PYTHON" "1")
(setenv "PYTHON" (setenv "PYTHON"
(search-input-file inputs "/bin/python")) (search-input-file inputs "/bin/python"))
(setenv "MOZ_BUILD_DATE" ,%icedove-build-id) ; avoid timestamp (setenv "MOZ_BUILD_DATE" #$%icedove-build-id) ; avoid timestamp
(setenv "MOZ_APP_NAME" "icedove") (setenv "MOZ_APP_NAME" "icedove")
(setenv "LDFLAGS" (string-append "-Wl,-rpath=" (setenv "LDFLAGS" (string-append "-Wl,-rpath=" #$output
(assoc-ref outputs "out")
"/lib/icedove")) "/lib/icedove"))
(mkdir-p (string-append (getcwd) "/builddir")) (mkdir-p (string-append (getcwd) "/builddir"))
(with-output-to-file mozconfig (with-output-to-file mozconfig
@ -1425,7 +1426,7 @@ standards of the IceCat project.")
"ac_add_options --enable-strip\n" "ac_add_options --enable-strip\n"
"ac_add_options --enable-system-ffi\n" "ac_add_options --enable-system-ffi\n"
"ac_add_options --enable-system-pixman\n" "ac_add_options --enable-system-pixman\n"
"ac_add_options --prefix=" out "\n" "ac_add_options --prefix=" #$output "\n"
"ac_add_options --with-clang-path=" (assoc-ref %build-inputs "clang") "/bin/clang\n" "ac_add_options --with-clang-path=" (assoc-ref %build-inputs "clang") "/bin/clang\n"
"ac_add_options --with-distribution-id=org.gnu\n" "ac_add_options --with-distribution-id=org.gnu\n"
"ac_add_options --with-libclang-path=" (assoc-ref %build-inputs "clang") "/lib\n" "ac_add_options --with-libclang-path=" (assoc-ref %build-inputs "clang") "/lib\n"
@ -1450,9 +1451,8 @@ standards of the IceCat project.")
;; Thunderbird doesn't provide any .desktop file. ;; Thunderbird doesn't provide any .desktop file.
;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1637575 ;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1637575
(add-after 'install 'install-desktop-file (add-after 'install 'install-desktop-file
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")) (let ((apps (string-append #$output "/share/applications")))
(apps (string-append out "/share/applications")))
(mkdir-p apps) (mkdir-p apps)
(with-output-to-file (string-append apps "/icedove.desktop") (with-output-to-file (string-append apps "/icedove.desktop")
(lambda _ (lambda _
@ -1471,16 +1471,15 @@ standards of the IceCat project.")
[Desktop Action ComposeMessage]~@ [Desktop Action ComposeMessage]~@
Name=Write new message~@ Name=Write new message~@
Exec=~@*~a/bin/icedove -compose~%" Exec=~@*~a/bin/icedove -compose~%"
out)))))) #$output))))))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((lib (string-append #$output "/lib"))
(lib (string-append out "/lib")) (gtk #$(this-package-input "gtk+"))
(gtk (assoc-ref inputs "gtk+"))
(gtk-share (string-append gtk "/share")) (gtk-share (string-append gtk "/share"))
(pulseaudio (assoc-ref inputs "pulseaudio")) (pulseaudio #$(this-package-input "pulseaudio"))
(pulseaudio-lib (string-append pulseaudio "/lib")) (pulseaudio-lib (string-append pulseaudio "/lib"))
(eudev (assoc-ref inputs "eudev")) (eudev #$(this-package-input "eudev"))
(eudev-lib (string-append eudev "/lib"))) (eudev-lib (string-append eudev "/lib")))
(wrap-program (car (find-files lib "^icedove$")) (wrap-program (car (find-files lib "^icedove$"))
`("XDG_DATA_DIRS" prefix (,gtk-share)) `("XDG_DATA_DIRS" prefix (,gtk-share))