From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?B?5a6L5paH5q2m?= Subject: Re: [PATCH] gnu: Add nss. Date: Sun, 11 Jan 2015 15:51:31 +0800 Message-ID: <87wq4tlpq4.fsf@gmail.com> References: <1420630189-3971-1-git-send-email-iyzsong@gmail.com> <87387m1qo2.fsf@netris.org> <87lhldmnpi.fsf@gmail.com> <87387igxbw.fsf@gnu.org> <20150111073030.GA28900@jocasta.intra> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YADJ6-0007Fo-Ht for guix-devel@gnu.org; Sun, 11 Jan 2015 02:51:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YADJ2-0008V4-LH for guix-devel@gnu.org; Sun, 11 Jan 2015 02:51:32 -0500 In-Reply-To: <20150111073030.GA28900@jocasta.intra> 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: John Darrington , Ludovic Court??s Cc: guix-devel@gnu.org John Darrington writes: > Nss has already been packaged on the wup-libreoffice branch. Ah, I didn't notice it :( I look into wip-libreoffice branch, it seems that: it use bundle nspr. it only build for x86_64-linux. tests are disable. While my version is more complete: build for all architectures. tests are enable. So, I think we should pick my version :) > > J' > > On Sat, Jan 10, 2015 at 10:06:11PM +0100, Ludovic Court??s wrote: > ????????? skribis: > > > 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 mozilla. > > Yes please, sounds better. > > > 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). > > Or just build it with --disable-static until someone asks for them? > > > From f56c7ef06f8eb697e9b0e0eac2e6c8117520d5d0 Mon Sep 17 00:00:00 2001 > > From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= > > 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. > > [...] > > > 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. > > 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. :-) > > > +Based on nss-3.17-gentoo-fixups.patch from nixpkgs. > > Please make it clear who wrote this patch, where you took it, whether it > differs from the Gentoo patch and how. > > > + (alist-replace > > + 'configure > > + (lambda* (#:key system inputs #:allow-other-keys) > > + (when (string-prefix? "x86_64" system) > > + (setenv "USE_64" "1"))) > > Please add a comment explaining why this is needed, and return #t. > > > + (alist-replace > > + 'check > > + (lambda _ > > + (setenv "DOMSUF" "(none)") > > + (setenv "USE_IP" "TRUE") > > + (setenv "IP_ADDRESS" "127.0.0.1") > > + (zero? (system "./nss/tests/all.sh"))) > > Likewise, a comment must explain this. Please use ???system*???. > > > + (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. > > So does this do the same thing that the big patch is supposed to do? > I???m confused. > > Thank you, > Ludo???. > > > -- > PGP Public key ID: 1024D/2DE827B3 > fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3 > See http://sks-keyservers.net or any PGP keyserver for public key.