python3Packages.python-vlc: 3.0.20123 -> 3.0.21203
This commit is contained in:
@@ -4,31 +4,29 @@
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
libvlc,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-vlc";
|
||||
version = "3.0.20123";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "3.0.21203";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JE+7njkqAyaEH8qSbW0SoqNsVGmCGR9JPxSPoZ5msdQ=";
|
||||
pname = "python_vlc";
|
||||
inherit version;
|
||||
hash = "sha256-UtBUSydrEeWLbAt0jD4FGPlPdLG0zTKMg6WerKvq0ew=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Patch path for VLC
|
||||
(substituteAll {
|
||||
src = ./vlc-paths.patch;
|
||||
libvlcPath = "${libvlc}/lib/libvlc.so.5";
|
||||
(replaceVars ./vlc-paths.patch {
|
||||
libvlc = "${libvlc}/lib/libvlc.so.5";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
diff --git a/vlc.py b/vlc.py
|
||||
index e3245a5..cebec09 100644
|
||||
index ce535be..d3edd69 100644
|
||||
--- a/vlc.py
|
||||
+++ b/vlc.py
|
||||
@@ -190,7 +190,7 @@ def find_lib():
|
||||
@@ -179,7 +179,7 @@ def find_lib():
|
||||
|
||||
else:
|
||||
# All other OSes (linux, freebsd...)
|
||||
- p = find_library('vlc')
|
||||
+ p = "@libvlcPath@"
|
||||
- p = find_library("vlc")
|
||||
+ p = "@libvlc@"
|
||||
try:
|
||||
dll = ctypes.CDLL(p)
|
||||
except OSError: # may fail
|
||||
|
||||
Reference in New Issue
Block a user