guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/05: gnu: python-lz4: Remove bundled copy of lz4.


From: guix-commits
Subject: 04/05: gnu: python-lz4: Remove bundled copy of lz4.
Date: Mon, 3 Feb 2020 09:27:39 -0500 (EST)

mbakke pushed a commit to branch master
in repository guix.

commit 9bf02042caee4bc9df4b8ab3cb879a20c6ed8b84
Author: Marius Bakke <address@hidden>
AuthorDate: Sat Feb 1 15:51:29 2020 +0100

    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.
---
 gnu/packages/python-compression.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-compression.scm 
b/gnu/packages/python-compression.scm
index 70abc7b..7a0f3ae 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017 Julien Lepiller <address@hidden>
 ;;; Copyright © 2018, 2019 Efraim Flashner <address@hidden>
 ;;; Copyright © 2020 Nicolas Goaziou <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]