From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:39490) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfsAg-0004q0-FJ for guix-patches@gnu.org; Tue, 25 Jun 2019 16:36:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfsAe-0008LR-H9 for guix-patches@gnu.org; Tue, 25 Jun 2019 16:36:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48305) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfsAc-0008It-MF for guix-patches@gnu.org; Tue, 25 Jun 2019 16:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hfsAc-0002L8-Gb for guix-patches@gnu.org; Tue, 25 Jun 2019 16:36:02 -0400 Subject: [bug#36352] [PATCH] gnu: Add solvespace. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:38871) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfsA3-00047A-LC for guix-patches@gnu.org; Tue, 25 Jun 2019 16:35:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfs9z-00075U-Gw for guix-patches@gnu.org; Tue, 25 Jun 2019 16:35:25 -0400 Received: from mx1.riseup.net ([198.252.153.129]:40640) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfs9u-0006h5-Nx for guix-patches@gnu.org; Tue, 25 Jun 2019 16:35:19 -0400 Received: from bell.riseup.net (bell-pn.riseup.net [10.0.1.178]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 3B1951A0201 for ; Tue, 25 Jun 2019 13:35:07 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 8DF84222DCE for ; Tue, 25 Jun 2019 13:35:06 -0700 (PDT) References: <20190624122710.22874-1-myles@tdma.co> From: swedebugia Message-ID: Date: Tue, 25 Jun 2019 22:35:03 +0200 MIME-Version: 1.0 In-Reply-To: <20190624122710.22874-1-myles@tdma.co> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US 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: 36352@debbugs.gnu.org On 2019-06-24 14:27, Myles English wrote: > * gnu/packages/game-development.scm (solvespace): New variable and > dependencies on gnu package modules. > --- > gnu/packages/engineering.scm | 70 +++++++++++++++++++++++++++++++++++= + > 1 file changed, 70 insertions(+) >=20 > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.sc= m > index 7d48414889..7fc06a6730 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -11,6 +11,7 @@ > ;;; Copyright =C2=A9 2018, 2019 Jonathan Brielmaier > ;;; Copyright =C2=A9 2018, 2019 Arun Isaac > ;;; Copyright =C2=A9 2019 Tim Stahel > +;;; Copyright =C2=A9 2019 Myles English > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -80,6 +81,7 @@ > #:use-module (gnu packages python-xyz) > #:use-module (gnu packages qt) > #:use-module (gnu packages readline) > + #:use-module (gnu packages serialization) > #:use-module (gnu packages swig) > #:use-module (gnu packages tcl) > #:use-module (gnu packages texinfo) > @@ -87,6 +89,8 @@ > #:use-module (gnu packages tex) > #:use-module (gnu packages version-control) > #:use-module (gnu packages wxwidgets) > + #:use-module (gnu packages web) > + #:use-module (gnu packages xml) > #:use-module (gnu packages xorg)) > =20 > (define-public librecad > @@ -2062,3 +2066,69 @@ purpose circuit simulator and can perform DC and= transient analyses, fourier > analysis and AC analysis. The engine is designed to do true mixed-mo= de > simulation.") > (license license:gpl3+))) > + > +(define-public solvespace-3 > + (let ((commit "5df53fc59e7f31e265fabd4c15e6601bd3032833") > + (revision "1")) > + (package > + (name "solvespace") > + (version (git-version "3.0" revision commit)) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/solvespace/solvespace.git") > + (commit commit) > + (recursive? #t))) A stable release tarball is available on the release page it seems. https://github.com/solvespace/solvespace/releases > + (sha256 > + (base32 > + "0kps2rgakdrbm9f6gwkb7za5ikkc4m6y2x162y3c53ixg5snmlr1")) > + (file-name (git-file-name name version)) > + (modules '((guix build utils))) > + (snippet > + '(begin > + ;; delete some recursive submodules in order to use guix = packages > + (delete-file-recursively "extlib/zlib") > + (delete-file-recursively "extlib/libpng") > + (delete-file-recursively "extlib/freetype") > + ;; pixman only needed for tests? > + (delete-file-recursively "extlib/pixman") > + (delete-file-recursively "extlib/cairo") > + (delete-file-recursively "extlib/flatbuffers") > + #t)))) > + (build-system cmake-build-system) > + (arguments > + `(#:configure-flags > + (list "-DCMAKE_BUILD_TYPE=3DRelease" > + (string-append > + "-DFLATC=3D" > + (assoc-ref %build-inputs "flatbuffers") "/bin/flatc")) > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'set-git-commit-hash > + (lambda* (#:key inputs #:allow-other-keys) > + (substitute* "CMakeLists.txt" > + (("include\\(GetGitCommitHash\\)") > + "#include(GetGitCommitHash)") > + (("\\# set\\(GIT_COMMIT_HASH > + 0000000000000000000000000000000000= 000000\\)") > + (string-append "set(GIT_COMMIT_HASH " ,commit ")")) > + (("message\\(STATUS \\\"Using in-tree flatbuffers\\\"= \\)") > + "message(STATUS \"Using guix flatbuffers\")") > + (("add_subdirectory\\(extlib/flatbuffers EXCLUDE_FROM= _ALL\\)") > + "#add_subdirectory(extlib/flatbuffers EXCLUDE_FROM_A= LL)")) > + #t))))) > + (native-inputs > + `(("pkg-config" ,pkg-config))) > + (inputs > + `(("git" ,git) > + ("json-c" ,json-c) > + ("glu" ,glu) > + ("gtkmm" ,gtkmm) > + ("flatbuffers" ,flatbuffers))) > + (home-page "http://solvespace.com") > + (synopsis "Parametric 2D/3D CAD tool") > + (description "Parametric 2D/3D computer aided design (CAD) tool = and > +constraint-based parametric modeler with simple mechanical simulation > +capabilities.") > + (license license:gpl3+)))) >=20 The patch did not apply for some reason. I did not try to build this package because the recursive checkouts of=20 cairo et al took too much bandwidth. This is another reason to use the=20 tarball instead - less waste of bandwidth. Could you switch to that? --=20 Cheers Swedebugia