Skip to content

Commit

Permalink
libiio: 0.21 -> 0.23
Browse files Browse the repository at this point in the history
  • Loading branch information
alexshpilkin authored and Artturin committed Sep 7, 2022
1 parent 00c23f4 commit 3643102
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +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})
--- a/CMakeLists.txt 2022-06-02 02:57:01.503340155 +0300
+++ b/CMakeLists.txt 2022-06-02 02:54:33.726941188 +0300
@@ -378,7 +378,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
8 changes: 6 additions & 2 deletions pkgs/development/libraries/libiio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,23 @@
, libxml2
, python
, libusb1
, avahi
, libaio
, runtimeShell
, lib
}:

stdenv.mkDerivation rec {
pname = "libiio";
version = "0.21";
version = "0.23";

outputs = [ "out" "lib" "dev" "python" ];

src = fetchFromGitHub {
owner = "analogdevicesinc";
repo = "libiio";
rev = "v${version}";
sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7";
sha256 = "0awny9zb43dcnxa5jpxay2zxswydblnbn4x6vi5mlw1r48pzhjf8";
};

# Revert after https://github.com/NixOS/nixpkgs/issues/125008 is
Expand All @@ -37,6 +39,8 @@ stdenv.mkDerivation rec {
python
libxml2
libusb1
avahi
libaio
] ++ lib.optional python.isPy3k python.pkgs.setuptools;

cmakeFlags = [
Expand Down

0 comments on commit 3643102

Please sign in to comment.