From 7c139daa07566f52947e242d1513d547f3d15d50 Mon Sep 17 00:00:00 2001 From: Tungsten842 <886724vf@anonaddy.me> Date: Sun, 1 Oct 2023 18:42:05 +0200 Subject: [PATCH] speexdsp: add withFftw3 flag --- pkgs/development/libraries/speexdsp/default.nix | 16 +++++++++++----- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 5e6f27f434ad..f73ebe0141a9 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, fftw +, withFftw3 ? true +}: stdenv.mkDerivation rec { pname = "speexdsp"; @@ -15,11 +22,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ fftw ]; + buildInputs = lib.optionals withFftw3 [ fftw ]; - configureFlags = [ - "--with-fft=gpl-fftw3" - ] ++ lib.optional stdenv.isAarch64 "--disable-neon"; + configureFlags = lib.optionals withFftw3 [ "--with-fft=gpl-fftw3" ] + ++ lib.optional stdenv.isAarch64 "--disable-neon"; meta = with lib; { homepage = "https://www.speex.org/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c01b5f225476..bf91ebcc72e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27057,7 +27057,10 @@ with pkgs; libcardiacarrest = callPackage ../misc/libcardiacarrest { }; - easyeffects = callPackage ../applications/audio/easyeffects { }; + easyeffects = callPackage ../applications/audio/easyeffects { + # Fix crashes with speexdsp effects + speexdsp = speexdsp.override { withFftw3 = false; }; + }; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { };