gnu: pbzip2: Various fixes.

* gnu/packages/compression.scm (pbzip)[uri]: Replace hardcoded version
  with variable.
  [arguments]: Remove configure phase. Add make flag.
This commit is contained in:
Efraim Flashner 2015-10-22 20:17:12 +03:00
parent c595cd47d8
commit 21b2ec4d3a
1 changed files with 8 additions and 9 deletions

View File

@ -26,6 +26,7 @@
(define-module (gnu packages compression) (define-module (gnu packages compression)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#: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)
@ -232,8 +233,9 @@ decompression.")
(version "1.1.12") (version "1.1.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://launchpad.net/pbzip2/1.1/" version (uri (string-append "https://launchpad.net/pbzip2/"
"/+download/" name "-" version ".tar.gz")) (version-major+minor version) "/" version
"/+download/" name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1vk6065dv3a47p86vmp8hv3n1ygd9hraz0gq89gvzlx7lmcb6fsp")))) "1vk6065dv3a47p86vmp8hv3n1ygd9hraz0gq89gvzlx7lmcb6fsp"))))
@ -243,20 +245,17 @@ decompression.")
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(replace 'configure (delete 'configure))
(lambda* (#:key outputs #:allow-other-keys) #:make-flags (list (string-append "PREFIX=" %output))))
(substitute* "Makefile"
(("/usr") (assoc-ref outputs "out")))
#t)))))
(home-page "http://compression.ca/pbzip2/") (home-page "http://compression.ca/pbzip2/")
(synopsis "Parallel bzip2 implementation") (synopsis "Parallel bzip2 implementation")
(description (description
"Pbzip2 is a parallel implementation of the bzip2 block-sorting file "Pbzip2 is a parallel implementation of the bzip2 block-sorting file
compressor that uses pthreads and achieves near-linear speedup on SMP machines. compressor that uses pthreads and achieves near-linear speedup on SMP machines.
The output of this version is fully compatible with bzip2 v1.0.2 (ie: anything The output of this version is fully compatible with bzip2 v1.0.2 (i.e. anything
compressed with pbzip2 can be decompressed with bzip2).") compressed with pbzip2 can be decompressed with bzip2).")
(license (license:non-copyleft "file://COPYING" (license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution.")))) "See COPYING in the distribution."))))
(define-public xz (define-public xz
(package (package