From d84a81458b1cdd8f204efbdf9f3c374d2a7e620e Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Wed, 18 Feb 2026 04:43:20 +0200 Subject: [PATCH] friture: remove python3Packages.pyrr dep, cleanup --- pkgs/by-name/fr/friture/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fr/friture/package.nix b/pkgs/by-name/fr/friture/package.nix index 262851c626b9..b2defd58301a 100644 --- a/pkgs/by-name/fr/friture/package.nix +++ b/pkgs/by-name/fr/friture/package.nix @@ -18,8 +18,9 @@ python3Packages.buildPythonApplication (finalAttrs: { }; postPatch = '' - sed -i -e 's/==.*"/"/' -e '/packages=\[/a "friture.playback",' pyproject.toml - sed -i -e 's/tostring/tobytes/' friture/spectrogram_image.py + substituteInPlace pyproject.toml \ + --replace-fail "numpy==2.3.2" "numpy" \ + --replace-fail "Cython==3.1.3" "Cython" ''; nativeBuildInputs = @@ -31,6 +32,12 @@ python3Packages.buildPythonApplication (finalAttrs: { ]) ++ (with qt5; [ wrapQtAppsHook ]); + # Very strict versions + pythonRelaxDeps = true; + + # Not actually used, dropped from nixpkgs + pythonRemoveDeps = [ "pyrr" ]; + buildInputs = with qt5; [ qtquickcontrols2 ]; propagatedBuildInputs = with python3Packages; [ @@ -43,7 +50,6 @@ python3Packages.buildPythonApplication (finalAttrs: { numpy pyqt5 appdirs - pyrr rtmixer ]; @@ -52,7 +58,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; postInstall = '' - substituteInPlace $out/share/applications/friture.desktop --replace usr/bin/friture friture + substituteInPlace $out/share/applications/friture.desktop --replace-fail usr/bin/friture friture for size in 16 32 128 256 512 do