From 84143c424b06b7caedcadc0bf20d02f15f60c5aa Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 19 Jul 2025 17:49:12 +0200 Subject: [PATCH] python3Packages.miniaudio: use vendorded miniaudio Signed-off-by: Marcin Serwin --- .../python-modules/miniaudio/default.nix | 21 +------------------ pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index c8bf9d91a1a7..6d857d248e76 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -3,22 +3,10 @@ buildPythonPackage, fetchFromGitHub, setuptools, - miniaudio, cffi, pytestCheckHook, }: -let - # TODO: recheck after 1.59 - miniaudio' = miniaudio.overrideAttrs (oldAttrs: rec { - version = "0.11.16"; # cffi breakage with 0.11.17 - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/${version}"; - hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM="; - }; - }); -in buildPythonPackage rec { pname = "miniaudio"; version = "1.61"; @@ -31,14 +19,7 @@ buildPythonPackage rec { hash = "sha256-H3o2IWGuMqLrJTzQ7w636Ito6f57WBtMXpXXzrZ7UD8="; }; - postPatch = '' - rm -r miniaudio - ln -s ${miniaudio'} miniaudio - substituteInPlace build_ffi_module.py \ - --replace-fail "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; - substituteInPlace miniaudio.c \ - --replace-fail "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; - ''; + # TODO: Properly unvendor miniaudio c library build-system = [ setuptools ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e7bfc8df7f1..9ca3f3ce7f75 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9329,9 +9329,7 @@ self: super: with self; { minexr = callPackage ../development/python-modules/minexr { }; - miniaudio = callPackage ../development/python-modules/miniaudio { - inherit (pkgs) miniaudio; - }; + miniaudio = callPackage ../development/python-modules/miniaudio { }; minichain = callPackage ../development/python-modules/minichain { };