mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-21 05:25:38 +00:00
0b0b74367f
* Format with nixpkgs-format. * Reorder the attribute to be more in line with convention. * Use simpler git ref. * Hardcode paths within bindings using patch (the replaced value actually changed in this version and without this clean-up, it would have gone unnoticed.) * Let the build script install the python bindings instead of doing it manually (required the same hardcoding as above in the setup.py.) * Use cmakeFlags attribute with placeholder instead of doing that in preConfigure. * Move udev rules to lib since etc is meant for admins. * License is actually lgpl2.1+.
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
diff --git a/bindings/python/iio.py b/bindings/python/iio.py
|
|
index 5306daa..f8962ee 100644
|
|
--- a/bindings/python/iio.py
|
|
+++ b/bindings/python/iio.py
|
|
@@ -229,9 +229,9 @@ if "Windows" in _system():
|
|
_iiolib = "libiio.dll"
|
|
else:
|
|
# Non-windows, possibly Posix system
|
|
- _iiolib = "iio"
|
|
+ _iiolib = "@libiio@"
|
|
|
|
-_lib = _cdll(find_library(_iiolib), use_errno=True, use_last_error=True)
|
|
+_lib = _cdll(_iiolib, use_errno=True, use_last_error=True)
|
|
|
|
_get_backends_count = _lib.iio_get_backends_count
|
|
_get_backends_count.restype = c_uint
|
|
diff --git a/bindings/python/setup.py.cmakein b/bindings/python/setup.py.cmakein
|
|
index cd14e2e..516c409 100644
|
|
--- a/bindings/python/setup.py.cmakein
|
|
+++ b/bindings/python/setup.py.cmakein
|
|
@@ -62,7 +62,7 @@ class InstallWrapper(install):
|
|
_iiolib = "libiio.dll"
|
|
else:
|
|
# Non-windows, possibly Posix system
|
|
- _iiolib = "iio"
|
|
+ _iiolib = "@libiio@"
|
|
try:
|
|
import os
|
|
|
|
@@ -72,7 +72,7 @@ class InstallWrapper(install):
|
|
fulllibpath = find_recursive(destdir, "libiio.so")
|
|
_lib = _cdll(fulllibpath, use_errno=True, use_last_error=True)
|
|
else:
|
|
- _lib = _cdll(find_library(_iiolib), use_errno=True, use_last_error=True)
|
|
+ _lib = _cdll(_iiolib, use_errno=True, use_last_error=True)
|
|
if not _lib._name:
|
|
raise OSError
|
|
except OSError:
|