From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:50725) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iinwh-00050Y-LX for guix-patches@gnu.org; Sat, 21 Dec 2019 18:14:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iinwg-0006NB-Hl for guix-patches@gnu.org; Sat, 21 Dec 2019 18:14:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iinwg-0006MH-CN for guix-patches@gnu.org; Sat, 21 Dec 2019 18:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iinwg-0004pP-6e for guix-patches@gnu.org; Sat, 21 Dec 2019 18:14:02 -0500 Subject: [bug#38553] [PATCH 01/12] gnu: Add grantleetheme. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20191209215219.24247-1-h.goebel@crazy-compilers.com> <20191209215358.24449-1-h.goebel@crazy-compilers.com> <87immckle4.fsf@gnu.org> <176afb50-286a-6b0b-b6cb-25090adc4630@crazy-compilers.com> Date: Sun, 22 Dec 2019 00:13:40 +0100 In-Reply-To: <176afb50-286a-6b0b-b6cb-25090adc4630@crazy-compilers.com> (Hartmut Goebel's message of "Sat, 21 Dec 2019 20:19:36 +0100") Message-ID: <874kxtmfvf.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Hartmut Goebel Cc: 38553@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Hartmut Goebel skribis: >>> + (modify-phases (@ (guix build qt-build-system) %standard-phases) >> ^ >> As a rule of thumb, we should avoid using =E2=80=98@=E2=80=99 and =E2=80= =98@@=E2=80=99. So here, I=E2=80=99d >> suggest writing >> >> #:modules ((guix build qt-build-system) =E2=80=A6) >> >> to make sure that module is in scope. > > AFAIU the module already is in scope, since it is part of > %qt-build-system-modules. What I intend here is to address > "%standard-phases" as defined in (guix build qt-build-system). Actually, unless I=E2=80=99m mistaken, (guix build qt-build-system) is not = in scope by default. To fix it, we need: --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index b776845377..e2f277d3ca 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -126,7 +126,7 @@ (qt-wrap-excluded-outputs ''()) (system (%current-system)) (imported-modules %qt-build-system-modules) - (modules '((guix build cmake-build-system) + (modules '((guix build qt-build-system) (guix build utils)))) "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." @@ -208,7 +208,7 @@ provides a 'CMakeLists.txt' file as its build system." (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %qt-build-system-modules) - (modules '((guix build cmake-build-system) + (modules '((guix build qt-build-system) (guix build utils)))) "Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Does that make sense? With this change in place, no need for =E2=80=98@=E2=80=99! :-) >>> + (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) >> Could you add a comment explaining whether this is triple-license or >> something else? > > This seems to be common to many KDE packages including programs, libs > and docs. Programs have GPL, libs have LGPL and docs have FDL. Of course > I can add a respective comment, which most of the packages would get. Is > this your intention? Oh I see. Yes, that was my intention, but I guess you could make a super-concise one-line summary of that. Thanks! Ludo=E2=80=99. --=-=-=--