M-Labs
/
artiq-extrapkg
2
0
Fork 4
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

remove hidapi override 

Bug is fixed upstream.
This commit is contained in:
Sebastien Bourdeauducq 2022-06-02 19:08:51 +08:00
parent 9d9ce56b4d
commit 2296eb7f2a
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -113,15 +113,6 @@
in rec { in rec {
packages.x86_64-linux = rec { packages.x86_64-linux = rec {
# https://github.com/m-labs/artiq/issues/23
hidapi = pkgs.hidapi.overrideAttrs (oa: {
src = pkgs.fetchFromGitHub {
owner = "signal11";
repo = "hidapi";
rev = "a6a622ffb680c55da0de787ff93b80280498330f";
sha256 = "17n7c4v3jjrnzqwxpflggxjn6vkzscb32k4kmxqjbfvjqnx7qp7j";
};
});
korad_ka3005p = pkgs.python3Packages.buildPythonPackage { korad_ka3005p = pkgs.python3Packages.buildPythonPackage {
pname = "korad_ka3005p"; pname = "korad_ka3005p";
version = "1.1"; version = "1.1";
@ -157,7 +148,7 @@
postPatch = '' postPatch = ''
substituteInPlace lda/hidapi.py \ substituteInPlace lda/hidapi.py \
--replace "hidapi_lib_path = None"\ --replace "hidapi_lib_path = None"\
"hidapi_lib_path = '${hidapi}/lib/libhidapi-libusb.so.0'" "hidapi_lib_path = '${pkgs.hidapi}/lib/libhidapi-libusb.so.0'"
''; '';
}; };
thorlabs_tcube = pkgs.python3Packages.buildPythonPackage { thorlabs_tcube = pkgs.python3Packages.buildPythonPackage {