ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-01 09:02:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: icedove: Delete obsolete Python 2 input.

Browse source 
* gnu/packages/gnuzilla.scm (icedove)[native-inputs]: Replace python-2 with
python-wrapper.  Delete python.
[phases]: Delete trailing #t.
This commit is contained in:
Maxim Cournoyer 2022-05-13 14:12:02 -04:00
parent 5e25a69e6e
commit 34d705ff93
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/gnuzilla.scm
View file

@ -1000,8 +1000,7 @@ (define-public icedove
(mkdir "comm") (mkdir "comm")
(copy-recursively (assoc-ref inputs "thunderbird-sources") (copy-recursively (assoc-ref inputs "thunderbird-sources")
"comm") "comm")
(delete-file "sourcestamp.txt") (delete-file "sourcestamp.txt")))
#t))
(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))
@ -1014,16 +1013,14 @@ (define-public icedove
(find-files "." "Cargo.lock$")) (find-files "." "Cargo.lock$"))
(for-each generate-all-checksums (for-each generate-all-checksums
'("third_party/rust" '("third_party/rust"
"toolkit/library/rust"))) "toolkit/library/rust")))))
#t))
;; Fixes issue where each installation directory generates its own profile. ;; Fixes issue where each installation directory generates its own profile.
;; See e.g. https://trac.torproject.org/projects/tor/ticket/31457 ;; See e.g. 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"
(("MOZ_DEDICATED_PROFILES, True") (("MOZ_DEDICATED_PROFILES, True")
"MOZ_DEDICATED_PROFILES, False")) "MOZ_DEDICATED_PROFILES, False"))))
#t))
(add-after 'prepare-thunderbird-sources 'rename-to-icedove (add-after 'prepare-thunderbird-sources 'rename-to-icedove
(lambda _ (lambda _
(substitute* "comm/mail/confvars.sh" (substitute* "comm/mail/confvars.sh"
@ -1086,8 +1083,7 @@ (define-public icedove
(("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m)
(string-append m ", false);")) (string-append m ", false);"))
(("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m)
(string-append m ", false);"))) (string-append m ", false);")))))
#t))
(add-after 'build 'neutralize-store-references (add-after 'build 'neutralize-store-references
(lambda _ (lambda _
;; Mangle the store references to compilers & other build tools in ;; Mangle the store references to compilers & other build tools in
@ -1103,8 +1099,7 @@ (define-public icedove
(string-append store (string-append store
(string-take hash 8) (string-take hash 8)
"<!-- Guix: not a runtime dependency -->" "<!-- Guix: not a runtime dependency -->"
(string-drop hash 8)))) (string-drop hash 8))))))
#t))
(delete 'bootstrap) (delete 'bootstrap)
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs configure-flags #:allow-other-keys) (lambda* (#:key inputs outputs configure-flags #:allow-other-keys)
@ -1206,8 +1201,7 @@ (define-public icedove
[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)))) out))))))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -1220,8 +1214,7 @@ (define-public icedove
(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))
`("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib))) `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib)))))))))
#t))))))
(inputs (inputs
`(("bzip2" ,bzip2) `(("bzip2" ,bzip2)
("cairo" ,cairo) ("cairo" ,cairo)
@ -1285,8 +1278,7 @@ (define-public icedove
("node" ,node) ("node" ,node)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python) ("python" ,python-wrapper)
("python2" ,python-2.7)
("rust" ,rust) ("rust" ,rust)
("rust-cbindgen" ,rust-cbindgen-0.19) ("rust-cbindgen" ,rust-cbindgen-0.19)
("which" ,which) ("which" ,which)