Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 059f5fd8a866
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9291a3c0cfb4
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jul 7, 2018

  1. pythonpackages.sounddevice: 0.3.9 -> 0.3.11 and fix for portaudio lib… 

    …rary path (#43083)
    @dotlambda
    Jos van Bakel authored and dotlambda committed Jul 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9291a3c View commit details
Showing with 43 additions and 5 deletions.
  1. +9 −5 pkgs/development/python-modules/sounddevice/default.nix
  2. +34 −0 pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
14 changes: 9 additions & 5 deletions pkgs/development/python-modules/sounddevice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,25 +4,29 @@
, cffi
, numpy
, portaudio
, substituteAll
}:

buildPythonPackage rec {
pname = "sounddevice";
version = "0.3.9";
version = "0.3.11";

src = fetchPypi {
inherit pname version;
sha256 = "1c9e833f8c8ccc67c0291c3448b29e9acc548fe56d15ee6f7fdd7037e00319f8";
sha256 = "0pfcbgbl77nggchxb2i5rb78m7hpgn65aqpz99yfx1fgfbmy9yg1";
};

propagatedBuildInputs = [ cffi numpy portaudio ];

# No tests included nor upstream available.
doCheck = false;

prePatch = ''
substituteInPlace src/sounddevice.py --replace "'portaudio'" "'${portaudio}/lib/libportaudio.so.2'"
'';
patches = [
(substituteAll {
src = ./fix-portaudio-library-path.patch;
portaudio = "${portaudio}/lib/libportaudio.so.2";
})
];

meta = {
description = "Play and Record Sound with Python";
34 changes: 34 additions & 0 deletions pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
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
from _sounddevice import ffi as _ffi


-try:
- for _libname in (
- 'portaudio', # Default name on POSIX systems
- 'bin\\libportaudio-2.dll', # DLL from conda-forge
- ):
- _libname = _find_library(_libname)
- if _libname is not None:
- break
- else:
- raise OSError('PortAudio library not found')
- _lib = _ffi.dlopen(_libname)
-except OSError:
- if _platform.system() == 'Darwin':
- _libname = 'libportaudio.dylib'
- elif _platform.system() == 'Windows':
- _libname = 'libportaudio' + _platform.architecture()[0] + '.dll'
- else:
- raise
- import _sounddevice_data
- _libname = _os.path.join(
- next(iter(_sounddevice_data.__path__)), 'portaudio-binaries', _libname)
- _lib = _ffi.dlopen(_libname)
+_lib = _ffi.dlopen('@portaudio@')

_sampleformats = {
'float32': _lib.paFloat32,