b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #199959 from amjoseph-nixpkgs/pr/libiio/avahiSupport

Browse source 
libiio: allow build on systems without avahi
This commit is contained in:
Artturi 2022-11-08 22:27:12 +02:00 committed by GitHub
parent 956df740df ed6c74e81f
commit 2fe8fa4386
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/libiio/default.nix
View file

@ -6,7 +6,7 @@
, libxml2 , libxml2
, python , python
, libusb1 , libusb1
, avahi , avahiSupport ? true, avahi
, libaio , libaio
, runtimeShell , runtimeShell
, lib , lib
@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
python python
libxml2 libxml2
libusb1 libusb1
avahi
] ++ lib.optional python.isPy3k python.pkgs.setuptools ] ++ lib.optional python.isPy3k python.pkgs.setuptools
++ lib.optional avahiSupport avahi
++ lib.optional stdenv.isLinux libaio ++ lib.optional stdenv.isLinux libaio
++ lib.optionals stdenv.isDarwin [ CFNetwork CoreServices ]; ++ lib.optionals stdenv.isDarwin [ CFNetwork CoreServices ];
@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
# the linux-like directory structure is used for proper output splitting # the linux-like directory structure is used for proper output splitting
"-DOSX_PACKAGE=off" "-DOSX_PACKAGE=off"
"-DOSX_FRAMEWORK=off" "-DOSX_FRAMEWORK=off"
] ++ lib.optionals (!avahiSupport) [
"-DHAVE_DNS_SD=OFF"
]; ];
postPatch = '' postPatch = ''