diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-04-22 14:14:00 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-04-26 07:05:49 -0400 |
| commit | eb239e4793fb7b93c14ef52fedca01d2b01de0a0 (patch) | |
| tree | 29f06dfc9c142e14e5a207fcf88e91e471c47ee4 | |
| parent | 58646a949aadb4d7058aed9052d419730798d19d (diff) | |
| download | guix-eb239e4793fb7b93c14ef52fedca01d2b01de0a0.tar.gz | |
gnu: nss-3.98: Streamline source origin via inheritance.
* gnu/packages/nss.scm (nss-3.98): Simplify source via inheritance. Change-Id: I6c1df497a7ff538162afa128eca676997d76e28f
| -rw-r--r-- | gnu/packages/nss.scm | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 00770f11a9..a2843be17a 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> ;;; 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> ;;; ;;; This file is part of GNU Guix. @@ -253,7 +253,7 @@ security standards.") (inherit nss) (version "3.98") (source (origin - (method url-fetch) + (inherit (package-source nss)) (uri (let ((version-with-underscores (string-join (string-split version #\.) "_"))) (string-append @@ -262,17 +262,7 @@ security standards.") "nss-" version ".tar.gz"))) (sha256 (base32 - "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"))))) + "1kh98amfklrq6915n4mlbrcqghc3srm7rkzs9dkh21jwscrwqjgm")))) (arguments (substitute-keyword-arguments (package-arguments nss) ((#:phases phases) |