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

gnu: nss: Add which to to native inputs and use regular nspr.

Browse source 
* gnu/packages/nss.scm (nspr-next): Delete variable.
(nss) [native-inputs]: Add which.
[propagated-inputs]: Replace nspr-next with nspr.
* gnu/packages/gnuzilla.scm (icecat-minimal): Likewise.
This commit is contained in:
Maxim Cournoyer 2023-04-14 20:57:45 -04:00
parent c28b552d52
commit 20707a06d2
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/gnuzilla.scm
View file

@ -736,7 +736,7 @@ (define-public icecat-minimal
mit-krb5 mit-krb5
hunspell hunspell
libnotify libnotify
nspr-next nspr
nss nss
shared-mime-info shared-mime-info
sqlite sqlite

25
gnu/packages/nss.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -32,6 +32,7 @@ (define-module (gnu packages nss)
#:use-module (guix build-system mozilla) #:use-module (guix build-system mozilla)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -99,19 +100,6 @@ (define-public nspr-4.32
(base32 (base32
"0v3zds1id71j5a5si42a658fjz8nv2f6zp6w4gqrqmdr6ksz8sxv")))))) "0v3zds1id71j5a5si42a658fjz8nv2f6zp6w4gqrqmdr6ksz8sxv"))))))
(define-public nspr-next
(package
(inherit nspr)
(version "4.35")
(source (origin
(method url-fetch)
(uri (string-append
"https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v"
version "/src/nspr-" version ".tar.gz"))
(sha256
(base32
"13xwda56yhp1w7v02qvlxvlqiniw8kr4g3fxlljmv6wnlmz2k8vy"))))))
(define-public nss (define-public nss
(package (package
(name "nss") (name "nss")
@ -214,12 +202,9 @@ (define-public nss
(copy-recursively "dist/public/nss" inc) (copy-recursively "dist/public/nss" inc)
(copy-recursively (string-append obj "/bin") bin) (copy-recursively (string-append obj "/bin") bin)
(copy-recursively (string-append obj "/lib") lib))))))) (copy-recursively (string-append obj "/lib") lib)))))))
(inputs (inputs (list sqlite zlib))
(list sqlite zlib)) (propagated-inputs (list nspr)) ;required by nss.pc.
(propagated-inputs (native-inputs (list perl libfaketime which)) ;for tests
(list nspr-next)) ;required by nss.pc.
(native-inputs
(list perl libfaketime)) ;for tests
;; The NSS test suite takes around 48 hours on Loongson 3A (MIPS) when ;; The NSS test suite takes around 48 hours on Loongson 3A (MIPS) when
;; another build is happening concurrently on the same machine. ;; another build is happening concurrently on the same machine.