diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-04-23 00:01:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-23 00:01:28 +0200 |
commit | 45b047931022c0cd606ff978c058ff6d83acab86 (patch) | |
tree | c15f4ebc1a0120d08992c28218a7cd8f1f7a6c8f /pkgs | |
parent | eb67898a2c7004971574c86efaf8acc842cd313a (diff) | |
parent | 29ad469b43b6b8b4a57143a16b063f277ca1ba43 (diff) | |
download | nixlib-45b047931022c0cd606ff978c058ff6d83acab86.tar nixlib-45b047931022c0cd606ff978c058ff6d83acab86.tar.gz nixlib-45b047931022c0cd606ff978c058ff6d83acab86.tar.bz2 nixlib-45b047931022c0cd606ff978c058ff6d83acab86.tar.lz nixlib-45b047931022c0cd606ff978c058ff6d83acab86.tar.xz nixlib-45b047931022c0cd606ff978c058ff6d83acab86.tar.zst nixlib-45b047931022c0cd606ff978c058ff6d83acab86.zip |
Merge pull request #59913 from JohnAZoidberg/sounddevice-0.3.13
Fix pythonPackages.sounddevice and upgrade 0.3.12 -> 0.3.13
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/sounddevice/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index bdb003467f56..2094aa7793d6 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.3.12"; + version = "0.3.13"; src = fetchPypi { inherit pname version; - sha256 = "f59ae4e2ec12cb1e5940f06f08804ecca855d959de25ca45a3938de45d0f81a2"; + sha256 = "01x2hm3xxzhxrjcj21si4ggmvkwmy5hag7f6yabqlhwskws721cd"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; @@ -34,4 +34,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch index 5be786ee0f5c..a5761764fdbb 100644 --- a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch +++ b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch @@ -1,8 +1,8 @@ -diff --git a/sounddevice.py b/sounddevice.py -index f03476c..5745b6e 100644 ---- a/sounddevice.py -+++ b/sounddevice.py -@@ -58,28 +58,7 @@ from ctypes.util import find_library as _find_library +diff --git i/sounddevice.py w/sounddevice.py +index c7c1d62..aabcb12 100644 +--- i/sounddevice.py ++++ w/sounddevice.py +@@ -58,29 +58,7 @@ from ctypes.util import find_library as _find_library from _sounddevice import ffi as _ffi @@ -10,6 +10,7 @@ index f03476c..5745b6e 100644 - for _libname in ( - 'portaudio', # Default name on POSIX systems - 'bin\\libportaudio-2.dll', # DLL from conda-forge +- 'lib/libportaudio.dylib', # dylib from anaconda - ): - _libname = _find_library(_libname) - if _libname is not None: |