From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:47564) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ij8yG-0002o3-J3 for guix-patches@gnu.org; Sun, 22 Dec 2019 16:41:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ij8yE-0007uS-M2 for guix-patches@gnu.org; Sun, 22 Dec 2019 16:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44358) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ij8yE-0007sq-H3 for guix-patches@gnu.org; Sun, 22 Dec 2019 16:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ij8yE-0003yx-Cw for guix-patches@gnu.org; Sun, 22 Dec 2019 16:41:02 -0500 Subject: [bug#38711] [PATCH] build-system: qt: Actually use qt-build-system, not cmake-build-system. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:46312) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ij8xQ-0002gJ-0g for guix-patches@gnu.org; Sun, 22 Dec 2019 16:40:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ij8xO-0003uu-NE for guix-patches@gnu.org; Sun, 22 Dec 2019 16:40:11 -0500 From: Hartmut Goebel Date: Sun, 22 Dec 2019 22:40:03 +0100 Message-Id: <20191222214003.7352-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: 38711@debbugs.gnu.org Cc: ludo@gnu.org When the qt-build-system was created, based on the cmake-build-system, some references to cmake have been missed to be changed. * 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(-) 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") (((? 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") (((? derivation? source)) (derivation->output-path source)) ((source) --=20 2.21.1