me/guix
Archived
1
0
Fork 0
Code Activity

gnu: nss-3.98: Streamline source origin via inheritance.

Browse source 
* gnu/packages/nss.scm (nss-3.98): Simplify source via inheritance.

Change-Id: I6c1df497a7ff538162afa128eca676997d76e28f
This commit is contained in:
Maxim Cournoyer 2024-04-22 14:14:00 -04:00
parent 58646a949a
commit eb239e4793
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022, 2023, 2024 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.
@ -253,7 +253,7 @@ security standards.")
(inherit nss) (inherit nss)
(version "3.98") (version "3.98")
(source (origin (source (origin
(method url-fetch) (inherit (package-source nss))
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
(string-join (string-split version #\.) "_"))) (string-join (string-split version #\.) "_")))
(string-append (string-append
@ -262,17 +262,7 @@ security standards.")
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"1kh98amfklrq6915n4mlbrcqghc3srm7rkzs9dkh21jwscrwqjgm")) "1kh98amfklrq6915n4mlbrcqghc3srm7rkzs9dkh21jwscrwqjgm"))))
;; Create nss.pc and nss-config.
(patches (search-patches "nss-3.56-pkgconfig.patch"
"nss-getcwd-nonnull.patch"
"nss-increase-test-timeout.patch"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete the bundled copy of these libraries.
(delete-file-recursively "nss/lib/zlib")
(delete-file-recursively "nss/lib/sqlite")))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments nss) (substitute-keyword-arguments (package-arguments nss)
((#:phases phases) ((#:phases phases)