libeduvpn-common: 1.2.1 -> 2.0.1

This commit is contained in:
Benedikt Tissot 2024-06-05 10:25:21 +02:00
parent a0840027a1
commit 22362b3627
2 changed files with 6 additions and 21 deletions

View File

@ -5,11 +5,11 @@
buildGoModule rec { buildGoModule rec {
pname = "libeduvpn-common"; pname = "libeduvpn-common";
version = "1.2.1"; version = "2.0.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/eduvpn/eduvpn-common/releases/download/${version}/eduvpn-common-${version}.tar.xz"; url = "https://github.com/eduvpn/eduvpn-common/releases/download/${version}/eduvpn-common-${version}.tar.xz";
hash = "sha256-MCMbOVDx9nQwTLH8EjCFD2T6mFwwFX8Jvae8PIrstvU="; hash = "sha256-hTF9CSqU9c0+TOK+/oRGjY1fBCKpisiiTJnWZqcdvjA=";
}; };
vendorHash = null; vendorHash = null;

View File

@ -1,25 +1,10 @@
diff --git a/eduvpn_common/loader.py b/eduvpn_common/loader.py
index 673d180..195f8c1 100644
--- a/eduvpn_common/loader.py --- a/eduvpn_common/loader.py
+++ b/eduvpn_common/loader.py +++ b/eduvpn_common/loader.py
@@ -21,6 +21,7 @@ def load_lib() -> CDLL: @@ -22,6 +22,7 @@ def load_lib() -> CDLL:
:return: The Go shared library loaded with cdll.LoadLibrary from ctypes :return: The Go shared library loaded with cdll.LoadLibrary from ctypes
:rtype: CDLL :rtype: CDLL
""" """
+ return cdll.LoadLibrary("@libeduvpn-common@") + return cdll.LoadLibrary("@libeduvpn-common@")
lib_prefixes = defaultdict( libfile = f"libeduvpn_common-{__version__}.so"
lambda: "lib",
{
diff --git a/setup.py b/setup.py
index 0d23379..a9d7926 100755
--- a/setup.py
+++ b/setup.py
@@ -92,4 +92,6 @@ class bdist_wheel(_bdist_wheel):
self.exports_lib_path = "../../exports/lib" # default
def run(self): lib = None
+ _bdist_wheel.run(self)
+ return
self.plat_name_supplied = True # Force use platform
libpath = getlibpath(self.plat_name)