From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:49803) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijNoZ-0008JR-UD for guix-patches@gnu.org; Mon, 23 Dec 2019 08:32:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ijNoY-0005P0-O7 for guix-patches@gnu.org; Mon, 23 Dec 2019 08:32:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44667) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ijNoY-0005On-LB for guix-patches@gnu.org; Mon, 23 Dec 2019 08:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ijNoY-00061p-Hp for guix-patches@gnu.org; Mon, 23 Dec 2019 08:32:02 -0500 Subject: [bug#38711] [PATCH] build-system: qt: Actually use qt-build-system, not cmake-build-system. Resent-Message-ID: Date: Mon, 23 Dec 2019 15:30:33 +0200 From: Efraim Flashner Message-ID: <20191223133033.GQ1115@E5400> References: <20191222214003.7352-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ZgGN478A9hzzvyZc" Content-Disposition: inline In-Reply-To: <20191222214003.7352-1-h.goebel@crazy-compilers.com> 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: 38711@debbugs.gnu.org, ludo@gnu.org --ZgGN478A9hzzvyZc Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Dec 22, 2019 at 10:40:03PM +0100, Hartmut Goebel wrote: > When the qt-build-system was created, based on the cmake-build-system, > some references to cmake have been missed to be changed. This would explain some of the problems we've run into with, say, mumble. If applying this means we can reverse a7a91c01c98499c8a1e44fadea1b8f70e91fc16f and still have the binaries wrapped then I say go for it. >=20 > * guix/build-system/qt.scm (qt-build, qt-cross-build)[modules]: > Use qt-build-system, not cmake-build-system. [builder]: Call qt-build, > not cmake-build. > --- > guix/build-system/qt.scm | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm > index b776845377..67fdfa1230 100644 > --- a/guix/build-system/qt.scm > +++ b/guix/build-system/qt.scm > @@ -126,14 +126,14 @@ > (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." > (define builder > `(begin > (use-modules ,@modules) > - (cmake-build #:source ,(match (assoc-ref inputs "source") > + (qt-build #:source ,(match (assoc-ref inputs "source") Don't forget to re-indent the following lines > (((? derivation? source)) > (derivation->output-path source)) > ((source) > @@ -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 triple= t and > with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file = as its > @@ -237,7 +237,7 @@ build system." > `(,name . ,path))) > target-drvs)) > =20 > - (cmake-build #:source ,(match (assoc-ref native-drvs "source") > + (qt-build #:source ,(match (assoc-ref native-drvs "source") And here too. > (((? derivation? source)) > (derivation->output-path source)) > ((source) > --=20 > 2.21.1 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --ZgGN478A9hzzvyZc Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl4AwXYACgkQQarn3Mo9 g1F9SA//YqCIhZhPRjVvku1AtiEOIKbxU29gz4/DrLqgJV8xxGFGuWbZyX7cy6e3 8IJiNINV11QiG0nyQzy4dNN3efSjp9HZzYjmY7WeKyEN11/6UmkpPSejdgnaGKpP u1Lc3sPTdt8DtxDBPZ9WuNaL95cFanL7TFHglSdXfZ0BVvNjJw8o48dPFtSDqhpU dwenUCMZN+gTEgwSmjgR6P+JROc/Bi5of2Y6sT1qwX3+OqxW7hGHK986u0kk0uqp LlZZvgLHYygwb5MZS5eJWuXJWUxkt6b+E2nZtshGrqJghT7mgQy1kP2fhj8bUa/K dxOBinqEVrpqV4/rFLtPJiiBoF7rF4Sf1w45C+3PsXIgVSFnIT4jlqSY7Rp25Qmn PrdsxEoLE3B/1G3cpG1/jmCfWQDfE2L1uIId/rVn+lpZzCpBAn4YzxtaZhgbnM/I xBrTc9lk4kG7ahnssgb/sw2IlZkGBZGFlcMtBgujRFzKwOQ6kIuRS+us246LAPGZ ObqjmqqWLv1q5aYkfghIqAxbVEURDI6+7/zIPdRMWKcae4MfGxJwS5NDr3RKnPDH fOQ8KFM/mYLL9YgNCU5A+jqFC85a+pkHX4Pz4i3x+0pcKy0coQgQvqCWay+BrCkU XOgQ6MHcve/luLofbEhJAgVQzPBmz7LcSj1CQHQIdeCvG8Edyqg= =vBfn -----END PGP SIGNATURE----- --ZgGN478A9hzzvyZc--