From 28da3c19c2f0110a479e42a38b44eb3cbb82af19 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 9 Nov 2020 09:11:12 +0100
Subject: [PATCH] gnu: soci: Configure LIBDIR normally.

* gnu/packages/databases.scm (soci)[arguments]: Add SOCI_LIBDIR
to #:configure-flags instead of patching CMakeLists.txt.
---
 gnu/packages/databases.scm | 12 +++---------
 1 file 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 @@ (define-public soci
     (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