Merge #514: Fix libusb path for Darwin

1f9f147 Fix libusb path for Darwin (gruve-p) Pull request description: Supersedes #511 Top commit has no ACKs. Tree-SHA512: f206ede5f77a9431ec9a83fa8a65e9514585bff6313131de7d3174c27a0379697f296ed662161d6dfbe190f7e91a0bbeb680e8fc6dcd5c4939d905c60f52689f
bitcoin-core · May 27, 2021 · 075ce8c · 075ce8c
2 parents a7d8134 + 1f9f147
commit 075ce8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hwi-qt.spec b/hwi-qt.spec
@@ -11,7 +11,7 @@ def get_libusb_path():
     if platform.system() == 'Darwin':
         proc = subprocess.Popen(['brew', '--prefix', 'libusb'], stdout=subprocess.PIPE)
         prefix = proc.communicate()[0].rstrip().decode()
-        return os.path.join(prefix, "/lib/libusb-1.0.dylib")
+        return os.path.join(prefix, "lib", "libusb-1.0.dylib")
     if platform.system() == 'Linux':
         for lib_dir in ['/lib/x86_64-linux-gnu', '/usr/lib64', '/usr/lib', '/lib']:
             libusb_path = os.path.join(lib_dir, 'libusb-1.0.so.0')

diff --git a/hwi.spec b/hwi.spec
@@ -11,7 +11,7 @@ def get_libusb_path():
     if platform.system() == "Darwin":
         proc = subprocess.Popen(["brew", "--prefix", "libusb"], stdout=subprocess.PIPE)
         prefix = proc.communicate()[0].rstrip().decode()
-        return os.path.join(prefix, "/lib/libusb-1.0.dylib")
+        return os.path.join(prefix, "lib", "libusb-1.0.dylib")
     if platform.system() == "Linux":
         for lib_dir in ["/lib/x86_64-linux-gnu", "/usr/lib64", "/lib64" "/usr/lib", "/lib"]:
             libusb_path = os.path.join(lib_dir, "libusb-1.0.so.0")