From 81916c7444212112879aad30f7260cad58591011 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sat, 2 May 2020 10:08:57 -0700 Subject: [PATCH 1/2] pylibftdi: point to correct libusb library --- pkgs/development/python-modules/pylibftdi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index 9e8f96665d0b..e8aebbe4a14d 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pylibftdi/driver.py \ - --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb1.so')" \ + --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \ --replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')" ''; From 495ac69605a08b8b5f60c25a459e4d22376e4031 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sat, 2 May 2020 10:34:03 -0700 Subject: [PATCH 2/2] pylibftdi: remove httpserver dependency httpserver is only used in an example, and prevents python2 builds from working. --- pkgs/development/python-modules/pylibftdi/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index e8aebbe4a14d..54058ae1982d 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, httpserver , libftdi1 , libusb1 }: @@ -16,7 +15,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - httpserver libftdi1 libusb1 ];