mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge pull request #125043 from veprbl/pr/libiio_fix
libiio: fix build with wrong libxml2 find_package
This commit is contained in:
commit
9019025415
@ -0,0 +1,13 @@
|
|||||||
|
diff --color -ur a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
--- a/CMakeLists.txt 2021-05-30 13:46:22.256040282 +0200
|
||||||
|
+++ b/CMakeLists.txt 2021-05-30 14:15:42.530181216 +0200
|
||||||
|
@@ -333,7 +333,7 @@
|
||||||
|
# So, try first to find the CMake module provided by libxml2 package, then fallback
|
||||||
|
# on the CMake's FindLibXml2.cmake module (which can lack some definition, especially
|
||||||
|
# in static build case).
|
||||||
|
-find_package(LibXml2 QUIET NO_MODULE)
|
||||||
|
+find_package(LibXml2 QUIET MODULE)
|
||||||
|
if(DEFINED LIBXML2_VERSION_STRING)
|
||||||
|
set(LIBXML2_FOUND ON)
|
||||||
|
set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS})
|
||||||
|
Seulement dans b: good.patch
|
@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7";
|
sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Revert after https://github.com/NixOS/nixpkgs/issues/125008 is
|
||||||
|
# fixed properly
|
||||||
|
patches = [ ./cmake-fix-libxml2-find-package.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
flex
|
flex
|
||||||
|
Loading…
Reference in New Issue
Block a user