summary refs log tree commit diff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2020-11-09 09:11:12 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2020-11-09 10:19:40 +0100
commit28da3c19c2f0110a479e42a38b44eb3cbb82af19 (patch)
tree789670bb49ac8ae8252d360086249a5f0c2952fd
parentd8fe45547e796f665d8954b9a24fe4309ee4891e (diff)
downloadguix-28da3c19c2f0110a479e42a38b44eb3cbb82af19.tar.gz
gnu: soci: Configure LIBDIR normally.
* gnu/packages/databases.scm (soci)[arguments]: Add SOCI_LIBDIR
to #:configure-flags instead of patching CMakeLists.txt.
-rw-r--r--gnu/packages/databases.scm12
1 files changed, 3 insertions, 9 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index d1c9abdae7..00283c48c4 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3909,15 +3909,9 @@ The drivers officially supported by @code{libdbi} are:
     (arguments
      `(#:configure-flags
        ;; C++11 (-DSOCI_CXX11) is OFF by default.  hyperledger-iroha needs it.
-       (list "-DCMAKE_CXX_STANDARD=17")
-       #:tests? #f           ; may require running database management systems
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-lib-path
-           (lambda _
-             (substitute* "CMakeLists.txt"
-               (("set\\(SOCI_LIBDIR \"lib64\"\\)") ""))
-             #t)))))
+       (list "-DCMAKE_CXX_STANDARD=17"
+             "-DSOCI_LIBDIR=lib")
+       #:tests? #f))         ; may require running database management systems
     (synopsis "C++ Database Access Library")
     (description
      "SOCI is an abstraction layer for several database backends, including