Subject: [PATCH 02/38] gnu: nspr: Use mozilla-build-system.

From: Maxime Devos <[email-masked]>
Date: Thu, 30 Sep 2021 00:19:02 +0200

* gnu/packages/nss.scm
  (nspr)[build-system]: Adjust it.
  (nspr)[arguments]<#:configure-flags>: Remove now superfluous --target and
  --host.
---
 gnu/packages/nss.scm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 381756e387..6196ad692d 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -29,6 +29,7 @@
   #:use-module (guix gexp)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system mozilla)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages bash)
@@ -49,7 +50,7 @@
              (sha256
               (base32
                "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap"))))
-    (build-system gnu-build-system)
+    (build-system mozilla-build-system)
     (inputs
      ;; TODO(core-updates): Make these inputs unconditional.
      ;; For 'compile-et.pl' and 'nspr-config'.
@@ -72,16 +73,7 @@
        (list "--disable-static"
              "--enable-64bit"
              (string-append "LDFLAGS=-Wl,-rpath="
-                            (assoc-ref %outputs "out") "/lib")
-             ;; Mozilla deviates from Autotools conventions
-             ;; due to historical reasons.  Adjust to Mozilla conventions,
-             ;; otherwise the Makefile will try to use TARGET-gcc
-             ;; as a ‘native’ compiler.
-             ,@(if (%current-target-system)
-                   `(,(string-append "--host="
-                                     (nix-system->gnu-triplet (%current-system)))
-                     ,(string-append "--target=" (%current-target-system)))
-                   '()))
+                            (assoc-ref %outputs "out") "/lib"))
        ;; Use fixed timestamps for reproducibility.
        #:make-flags '("SH_DATE='1970-01-01 00:00:01'"
                       ;; This is epoch 1 in microseconds.
-- 
2.33.0