nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: icecat-source: Make sure 'makeicecat' is the right version. 

* gnu/packages/gnuzilla.scm (icecat-source): Check to make sure the
value of FFMAJOR in the 'makeicecat' script matches the major version
of IceCat being generated.
This commit is contained in:
Mark H Weaver 2019-05-06 10:20:32 -04:00
parent ebff346945
commit 3e605b6998
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/gnuzilla.scm
View File

@ -528,7 +528,13 @@ from forcing GEXP-PROMISE."
"-p1" "--input" #+makeicecat-patch) "-p1" "--input" #+makeicecat-patch)
(patch-shebang "makeicecat") (patch-shebang "makeicecat")
(substitute* "makeicecat" (substitute* "makeicecat"
(("^FFMAJOR=.*") (("^FFMAJOR=(.*)" all ffmajor)
(unless (string=? #$major-version
(string-trim-both ffmajor))
;; The makeicecat script cannot be expected to work
;; properly on a different version of Firefox, even if
;; no errors occur during execution.
(error "makeicecat major version mismatch"))
(string-append "FFMAJOR=" #$major-version "\n")) (string-append "FFMAJOR=" #$major-version "\n"))
(("^FFMINOR=.*") (("^FFMINOR=.*")
(string-append "FFMINOR=" #$minor-version "\n")) (string-append "FFMINOR=" #$minor-version "\n"))