From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: Re: [PATCH] gnu: Add nss. Date: Sun, 11 Jan 2015 08:30:30 +0100 Message-ID: <20150111073030.GA28900@jocasta.intra> References: <1420630189-3971-1-git-send-email-iyzsong@gmail.com> <87387m1qo2.fsf@netris.org> <87lhldmnpi.fsf@gmail.com> <87387igxbw.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="LQksG6bCIzRHxTLp" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YACz5-0004HH-Vr for guix-devel@gnu.org; Sun, 11 Jan 2015 02:30:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YACz4-0003WE-Ky for guix-devel@gnu.org; Sun, 11 Jan 2015 02:30:51 -0500 Content-Disposition: inline In-Reply-To: <87387igxbw.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic Court??s Cc: guix-devel@gnu.org --LQksG6bCIzRHxTLp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Nss has already been packaged on the wup-libreoffice branch. J' On Sat, Jan 10, 2015 at 10:06:11PM +0100, Ludovic Court??s wrote: ????????? skribis: =20 > Mark H Weaver writes: > >> ????????? writes: >> >>> * gnu/packages/patches/nss.patch: New file. >>> * gnu-system.scm (dist_patch_DATA): Add it. >>> * gnu/packages/polkit.scm (nss): New variable. >> >> polkit.scm seems like the wrong place for 'nss', although admittedly >> it's not obvious where it should go. > Maybe move it and nspr gnuzilla.scm? Since they are both from mozill= a. =20 Yes please, sounds better. =20 > NSS contains many static libraries which I think will not mostly used > by other. How about split them to a 'static-lib' (or a better name). =20 Or just build it with --disable-static until someone asks for them? =20 > From f56c7ef06f8eb697e9b0e0eac2e6c8117520d5d0 Mon Sep 17 00:00:00 20= 01 > From: =3D?UTF-8?q?=3DE5=3DAE=3D8B=3DE6=3D96=3D87=3DE6=3DAD=3DA6?=3D = > Date: Tue, 6 Jan 2015 23:57:31 +0800 > Subject: [PATCH] gnu: Add nss. > > * gnu/packages/patches/nss-pkgconfig.patch: New file. > * gnu-system.scm (dist_patch_DATA): Add it. > * gnu/packages/polkit.scm (nss): New variable. =20 [...] =20 > diff --git a/gnu/packages/patches/nss-pkgconfig.patch b/gnu/packages= /patches/nss-pkgconfig.patch > new file mode 100644 > index 0000000..3832dc3 > --- /dev/null > +++ b/gnu/packages/patches/nss-pkgconfig.patch > @@ -0,0 +1,220 @@ > +Install nss.pc and nss-config. =20 This is too terse compared to the size of the patch. Surely one should justify why it takes so many lines to install two files. :-) =20 > +Based on nss-3.17-gentoo-fixups.patch from nixpkgs. =20 Please make it clear who wrote this patch, where you took it, whether = it differs from the Gentoo patch and how. =20 > + (alist-replace > + 'configure > + (lambda* (#:key system inputs #:allow-other-keys) > + (when (string-prefix? "x86_64" system) > + (setenv "USE_64" "1"))) =20 Please add a comment explaining why this is needed, and return #t. =20 > + (alist-replace > + 'check > + (lambda _ > + (setenv "DOMSUF" "(none)") > + (setenv "USE_IP" "TRUE") > + (setenv "IP_ADDRESS" "127.0.0.1") > + (zero? (system "./nss/tests/all.sh"))) =20 Likewise, a comment must explain this. Please use ???system*???. =20 > + (alist-replace > + 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (bin (string-append (assoc-ref outputs "bin") "/= bin")) > + (inc (string-append out "/include/nss")) > + (lib (string-append out "/lib/nss")) > + (obj (match (scandir "dist" (cut string-suffix? = "OBJ" <>)) > + ((obj) (string-append "dist/" obj))))) > + ;; Install nss-config to $out/bin. > + (mkdir-p (string-append out "/bin")) > + (copy-file (string-append obj "/bin/nss-config") > + (string-append out "/bin/nss-config")) > + (delete-file (string-append obj "/bin/nss-config")) > + ;; Install nss.pc to $out/lib/pkgconfig. =20 So does this do the same thing that the big patch is supposed to do? I???m confused. =20 Thank you, Ludo???. =20 --=20 PGP Public key ID: 1024D/2DE827B3=20 fingerprint =3D 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3 See http://sks-keyservers.net or any PGP keyserver for public key. --LQksG6bCIzRHxTLp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlSyJpYACgkQimdxnC3oJ7NvEQCfdIymSK+CakLhqalalw7MGi4O mg4AmwRX9pm9zjUb9pHPscfKyBCjDv96 =8oLR -----END PGP SIGNATURE----- --LQksG6bCIzRHxTLp--