Merge pull request #224134 from dotlambda/miniaudio-1.56

python310Packages.miniaudio: 1.55 -> 1.56

pkgs/development/libraries/miniaudio/default.nix

@@ -4,15 +4,15 @@
 }:
 stdenv.mkDerivation rec {
   pname = "miniaudio";
-  version = "0.11.11";
+  version = "0.11.14";
 
   src = fetchFromGitHub {
     owner = "mackron";
     repo = "miniaudio";
-    rev = "a0dc1037f99a643ff5fad7272cd3d6461f2d63fa";
+    rev = "9a7663496fc06f7a9439c752fd7666ca93328c20";
     # upstream does not maintain tags:
     # https://github.com/mackron/miniaudio/issues/273#issuecomment-783861269
-    hash = "sha256-jOvDZk76hDvZ1RQ9O34kVeW0n95BT9+BE6fNhdekI5s=";
+    hash = "sha256-v/Eo4/CYcpB4tbOoy1gPqk6PUvkQIZNWrweG3l5EcMk=";
   };
 
   installPhase = ''

pkgs/development/python-modules/miniaudio/default.nix

@@ -3,6 +3,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, miniaudio
 , cffi
 , pytestCheckHook
 , AudioToolbox
@@ -11,17 +12,28 @@
 
 buildPythonPackage rec {
   pname = "miniaudio";
-  version = "1.55";
+  version = "1.56";
 
   disabled = pythonOlder "3.6";
 
+  format = "setuptools";
+
   src = fetchFromGitHub {
     owner = "irmen";
     repo = "pyminiaudio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-na8pnYIoawICbsVquzlmfYZtIagsVBudFOKJ62jSTGM=";
+    hash = "sha256-vNh9BupU6T+Gfa8fdt8r3/vqtTtfVDyrxM9GkFUcDcI=";
   };
 
+  postPatch = ''
+    rm -r miniaudio
+    ln -s ${miniaudio} miniaudio
+    substituteInPlace build_ffi_module.py \
+      --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c";
+    substituteInPlace miniaudio.c \
+      --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c";
+  '';
+
   buildInputs = lib.optionals stdenv.isDarwin [
     AudioToolbox
     CoreAudio

pkgs/top-level/python-packages.nix

@@ -6023,6 +6023,7 @@ self: super: with self; {
   minexr = callPackage ../development/python-modules/minexr { };
 
   miniaudio = callPackage ../development/python-modules/miniaudio {
+    inherit (pkgs) miniaudio;
     inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox CoreAudio;
   };