2 files changed, 67 insertions, 15 deletions
diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm
index 74dc80b5db..c43fb9a542 100644
--- a/guix/build-system/font.scm
+++ b/guix/build-system/font.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2017, 2022 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -54,20 +54,20 @@
   (bag
     (name name)
     (system system)
-    (host-inputs `(,@(if source
-                         `(("source" ,source))
-                         '())
-                   ,@inputs
-                   ,(list "tar" (module-ref (resolve-interface '(gnu packages base)) 'tar))
-                   ,@(let ((compression (resolve-interface '(gnu packages compression))))
-                       (map (match-lambda
-                              ((name package)
-                               (list name (module-ref compression package))))
-                            `(("gzip" gzip)
-                              ("bzip2" bzip2)
-                              ("unzip" unzip)
-                              ("xz" xz))))))
-    (build-inputs native-inputs)
+    (host-inputs inputs)
+    (build-inputs `(,@(if source
+                          `(("source" ,source))
+                          '())
+                    ,@native-inputs
+                    ,(list "tar" (module-ref (resolve-interface '(gnu packages base)) 'tar))
+                    ,@(let ((compression (resolve-interface '(gnu packages compression))))
+                        (map (match-lambda
+                               ((name package)
+                                (list name (module-ref compression package))))
+                             `(("gzip" gzip)
+                               ("bzip2" bzip2)
+                               ("unzip" unzip)
+                               ("xz" xz))))))
     (outputs outputs)
     (build font-build)
     (arguments (strip-keyword-arguments private-keywords arguments))))
diff --git a/guix/build-system/mozilla.scm b/guix/build-system/mozilla.scm
new file mode 100644
index 0000000000..b4141c8177
--- /dev/null
+++ b/guix/build-system/mozilla.scm
@@ -0,0 +1,52 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix build-system mozilla)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system)
+  #:use-module (guix utils)
+  #:export (mozilla-build-system))
+
+;;
+;; Build procedure for packages using Autotools with the Mozillian conventions
+;; for --target, --host and --build, which are different from the GNU
+;; conventions.
+;;
+;; Code:
+
+(define* (lower-mozilla name #:key system target #:allow-other-keys
+                        #:rest arguments)
+  (define lower (build-system-lower gnu-build-system))
+  (if target
+      (apply lower
+             (substitute-keyword-arguments arguments
+               ;; Override --target and --host to what Mozillian configure
+               ;; scripts expect.
+               ((#:configure-flags configure-flags ''())
+                `(cons* ,(string-append "--target=" target)
+                        ,(string-append "--host=" (nix-system->gnu-triplet system))
+                        ,configure-flags))))
+      (apply lower name arguments))) ; not cross-compiling
+
+(define mozilla-build-system
+  (build-system
+    (name 'mozilla)
+    (description "The build system for Mozilla software using the Autotools")
+    (lower lower-mozilla)))
+
+;;; mozilla.scm ends here