[guix] Added xmlpatch package.

ufz · Nov 1, 2023 · 4b7fa51 · 4b7fa51
1 parent 030ce27
commit 4b7fa51
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/.guix/modules/ogs-package.scm b/.guix/modules/ogs-package.scm
@@ -82,7 +82,8 @@
                   tclap
                   tetgen
                   zlib
-                  vtk))
+                  vtk
+                  xmlpatch))
     (native-inputs (list git ninja nss-certs)) ; TODO: cpm
     (synopsis "OpenGeoSys")
     (description
@@ -258,6 +259,28 @@
             `(#:tests? #f)
         )))
 
+(define xmlpatch
+      (package
+        (name "xmlpatch")
+        (synopsis "An XML Patch library")
+        (license license:lgpl2.1)
+        (description "")
+        (home-page "https://xmlpatch.sourceforge.net")
+        (version "0.4.3")
+        (source (origin
+                  (method git-fetch)
+                  (uri (git-reference
+                    (url "https://gitlab.opengeosys.org/ogs/libs/xmlpatch")
+                    (commit (string-append "v" version))))
+                  (sha256
+                   (base32
+                    "0872g9w1jd5r4c5a1s8ga4x1plg608b7rxyqjs6zv8ghjq9qlkvg"))))
+        (build-system cmake-build-system)
+        (inputs (list libxml2))
+        (arguments
+            `(#:tests? #f)
+        )))
+
 ;; return package
 ogs
 

diff --git a/ThirdParty/collection b/ThirdParty/collection
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
@@ -175,12 +175,19 @@ if(LibXml2_ADDED)
     list(APPEND DISABLE_WARNINGS_TARGETS LibXml2)
 endif()
 
-CPMAddPackage(
-    NAME xmlpatch
-    VERSION 0.4.2
-    GIT_REPOSITORY https://gitlab.opengeosys.org/ogs/libs/xmlpatch.git
-    OPTIONS "BUILD_SHARED_LIBS OFF"
-)
+if(GUIX_BUILD)
+    find_library(XMLPATCH_LIB xmlpatch REQUIRED)
+    add_library(xmlpatch INTERFACE)
+    find_package(LibXml2 REQUIRED)
+    target_link_libraries(xmlpatch INTERFACE ${XMLPATCH_LIB} LibXml2::LibXml2)
+else()
+    CPMAddPackage(
+        NAME xmlpatch
+        VERSION 0.4.2
+        GIT_REPOSITORY https://gitlab.opengeosys.org/ogs/libs/xmlpatch.git
+        OPTIONS "BUILD_SHARED_LIBS OFF"
+    )
+endif()
 
 if(OGS_BUILD_SWMM)
     CPMAddPackage(