nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: libwebsockets: Update to 1.3. 

* gnu/packages/web.scm (libwebsockets): Update to 1.3.  Switch to
  CMAKE-BUILD-SYSTEM.  Remove #:phases parameter and add #:tests?.
  Remove AUTOCONF, AUTOMAKE, and LIBTOOL from 'native-inputs'.
This commit is contained in:
Ludovic Courtès 2014-08-28 11:38:12 +02:00
parent 12507a3ee6
commit c23372131d
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnu/packages/web.scm
View File

@ -24,8 +24,9 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system perl)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
#:use-module (guix build-system cmake)
#:use-module (gnu packages apr) #:use-module (gnu packages apr)
#:use-module (gnu packages asciidoc) #:use-module (gnu packages asciidoc)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
@ -110,7 +111,7 @@ parse JSON formatted strings back into the C representation of JSON objects.")
(define-public libwebsockets (define-public libwebsockets
(package (package
(name "libwebsockets") (name "libwebsockets")
(version "1.2") (version "1.3")
(source (origin (source (origin
;; The project does not publish tarballs, so we have to take ;; The project does not publish tarballs, so we have to take
;; things from Git. ;; things from Git.
@ -118,29 +119,19 @@ parse JSON formatted strings back into the C representation of JSON objects.")
(uri (git-reference (uri (git-reference
(url "git://git.libwebsockets.org/libwebsockets") (url "git://git.libwebsockets.org/libwebsockets")
(commit (string-append "v" version (commit (string-append "v" version
"-chrome26-firefox18")))) "-chrome37-firefox30"))))
(sha256 (sha256
(base32 (base32
"1293hbz8qj4p27m1qjf8dn97r10xjyiwdpq491m87zi025s558cl")) "12fqh2d2098mgf0ls19p9lzibpsqhv7mc5rn1yvrbfnazmcr40g4"))
(file-name (string-append name "-" version)))) (file-name (string-append name "-" version))))
;; The package has both CMake and GNU build systems, but the latter is (build-system cmake-build-system)
;; apparently better supported (CMake-generated makefiles lack an
;; 'install' target, for instance.)
(build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before ;; XXX: The thing lacks a 'make test' target, because CMakeLists.txt
'configure 'bootstrap ;; doesn't use 'add_test', and it's unclear how to run the test suite.
(lambda _ '(#:tests? #f))
(chmod "libwebsockets-api-doc.html" #o666)
(zero? (system* "./autogen.sh")))
%standard-phases)))
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("perl" ,perl))) ; to build the HTML doc
("automake" ,automake)
("libtool" ,libtool "bin")
("perl" ,perl))) ; to build the HTML doc
(inputs `(("zlib" ,zlib) (inputs `(("zlib" ,zlib)
("openssl" ,openssl))) ("openssl" ,openssl)))
(synopsis "WebSockets library written in C") (synopsis "WebSockets library written in C")