summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-02-01 15:51:29 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-02-03 12:34:31 +0100
commit9bf02042caee4bc9df4b8ab3cb879a20c6ed8b84 (patch)
treead16808bcef4a15a418b7107b00c9ef9c052e7ef
parentc0fe2e1f03694cf7b29d418119c3ed0223973d59 (diff)
downloadpatches-9bf02042caee4bc9df4b8ab3cb879a20c6ed8b84.tar
patches-9bf02042caee4bc9df4b8ab3cb879a20c6ed8b84.tar.gz
gnu: python-lz4: Remove bundled copy of lz4.
* gnu/packages/python-compression.scm (python-lz4)[source](modules, snippet): New fields. [native-inputs]: Add PKG-CONFIG. [inputs]: Add LZ4.
-rw-r--r--gnu/packages/python-compression.scm15
1 files changed, 13 insertions, 2 deletions
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 70abc7bad1..7a0f3ae6ac 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,6 +33,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages check)
#:use-module (gnu packages maths)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx))
@@ -84,11 +86,20 @@ Python strings.")
(uri (pypi-uri "lz4" version))
(sha256
(base32
- "0ghv1xbaq693kgww1x9c22bplz479ls9szjsaa4ig778ls834hm0"))))
+ "0ghv1xbaq693kgww1x9c22bplz479ls9szjsaa4ig778ls834hm0"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove bundled copy of lz4.
+ (delete-file-recursively "lz4libs")
+ #t))))
(build-system python-build-system)
(native-inputs
- `(("python-nose" ,python-nose)
+ `(("pkg-config" ,pkg-config)
+ ("python-nose" ,python-nose)
("python-setuptools-scm" ,python-setuptools-scm)))
+ (inputs
+ `(("lz4" ,lz4)))
(home-page "https://github.com/python-lz4/python-lz4")
(synopsis "LZ4 bindings for Python")
(description