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 10:25:28 +0800 Message-ID: <87r3v26okn.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> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YA8DW-0006I0-3A for guix-devel@gnu.org; Sat, 10 Jan 2015 21:25:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YA8DU-0003Yl-ND for guix-devel@gnu.org; Sat, 10 Jan 2015 21:25:25 -0500 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 =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org Ludovic Court=C3=A8s writes: > =E5=AE=8B=E6=96=87=E6=AD=A6 skribis: > >> Mark H Weaver writes: >> >>> =E5=AE=8B=E6=96=87=E6=AD=A6 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? Um, I leave it untouched. (It add about 7MB to Qt5.) > >> From f56c7ef06f8eb697e9b0e0eac2e6c8117520d5d0 Mon Sep 17 00:00:00 2001 >> 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. > > [...] > >> diff --git a/gnu/packages/patches/nss-pkgconfig.patch b/gnu/packages/pat= ches/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 =E2=80=98system*=E2=80= =99. OK. > >> + (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=E2=80=99m confused. Actually, the patch do 'create', here do 'install'. > > Thank you, > Ludo=E2=80=99. Updated patches sent separated.