From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaJxp-0007dt-Dz for guix-patches@gnu.org; Sat, 13 Jan 2018 06:27:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaJxm-0000Dk-9D for guix-patches@gnu.org; Sat, 13 Jan 2018 06:27:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:46510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaJxm-0000Dc-5T for guix-patches@gnu.org; Sat, 13 Jan 2018 06:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eaJxl-0000D9-WF for guix-patches@gnu.org; Sat, 13 Jan 2018 06:27:02 -0500 Subject: [bug#30096] [PATCH 5/6] gnu: Add ocaml-tsdl. References: <87lgh2uigo.fsf@gmail.com> In-Reply-To: <87lgh2uigo.fsf@gmail.com> Resent-Message-ID: From: Peter Kreye Date: Sat, 13 Jan 2018 05:26:37 -0600 Message-ID: <87d12euhhu.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain 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: 30096@debbugs.gnu.org * gnu/packages/ocaml.scm (ocaml-tsdl): New variable. --- gnu/packages/ocaml.scm | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a60922c02..34458be28 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages sdl) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) @@ -3842,14 +3843,55 @@ without writing or generating any C!") (inputs `(("findlib" ,ocaml-findlib-1.7.3) ("topkg" ,ocaml-topkg) - ("astring" ,ocaml-astring) ("opam", opam))) + (propagated-inputs + `(("astring" ,ocaml-astring))) (synopsis "OCamlbuild plugin for C stubs") (description "Ocb-stubblr is about ten lines of code that you need to repeat over, over, over and over again if you are using ocamlbuild to build OCaml projects that contain C stubs.") (license license:isc))) +(define-public ocaml-tsdl + (package + (name "ocaml-tsdl") + (version "0.9.1") + (home-page "http://erratique.ch/software/tsdl") + (source (origin + (method url-fetch) + (uri (string-append home-page "/releases/tsdl-" + version ".tbz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08bb97fhvz829fb0sgjn2p20mp7b04v98zy2qxpk2w390a6c4b34")))) + (build-system ocaml-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let ((libdir (string-append (assoc-ref %build-inputs "findlib") + "/lib/ocaml/site-lib"))) + + (zero? (system* "ocaml" "-I" libdir "pkg/pkg.ml" "build" "--tests" "false"))))) + (delete 'check)))) + (native-inputs + `(("opam" ,opam) + ("pkg-config" ,pkg-config))) + (inputs + `(("findlib" ,ocaml-findlib-1.7.3) + ("topkg" ,ocaml-topkg) + ("result" ,ocaml-result) + ("sdl2" ,sdl2) + ("integers" ,ocaml-integers) + ("ctypes" ,ocaml-ctypes))) + (synopsis "Thin bindings to SDL for OCaml") + (description "Tsdl is an OCaml library providing thin bindings to the +cross-platform SDL C library.") + (license license:isc))) + (define-public coq-flocq (package (name "coq-flocq") -- 2.14.2