summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-03-31 16:17:18 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-03-31 21:26:15 +0200
commit5cc013f05d6dc1042e68d864e2938c2ffbc77871 (patch)
tree20666ad5e24d4713f83de918d50d406b338dcfce
parentad7c77fd7518fcd0671f6e13f6afbebf4c7435c9 (diff)
downloadguix-5cc013f05d6dc1042e68d864e2938c2ffbc77871.tar.gz
gnu: leveldb: Update to 1.21.
* gnu/packages/databases.scm (leveldb): Update to 1.21.
[build-system]: Change to CMAKE-BUILD-SYSTEM.
[arguments]: Adjust accordingly.
-rw-r--r--gnu/packages/databases.scm24
1 files changed, 5 insertions, 19 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 301aab2406..1fc6ababe4 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -239,33 +239,19 @@ ElasticSearch server")
 (define-public leveldb
   (package
     (name "leveldb")
-    (version "1.20")
+    (version "1.21")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/google/leveldb")
-                    (commit (string-append "v" version))))
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y"))))
-    (build-system gnu-build-system)
+                "00v0w6883z7a6204894j59nd5v6dazn3c8hvh3sbczv4wiabppw2"))))
+    (build-system cmake-build-system)
     (arguments
-     '(#:make-flags (list "CC=gcc")
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'install
-           ;; There is no install target, so we do it here.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (lib (string-append out "/lib"))
-                    (include (string-append out "/include")))
-               (for-each (lambda (file)
-                           (install-file file lib))
-                         (find-files "out-shared" "^libleveldb\\.so.*$"))
-               (copy-recursively "include" include)
-               #t))))))
+     `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DLEVELDB_BUILD_TESTS=ON")))
     (inputs
      `(("snappy" ,snappy)))
     (home-page "http://leveldb.org/")