From 71586f530784b6088a3e7b960bd1583978f21857 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sun, 28 Mar 2021 17:58:49 -0400 Subject: [PATCH 1/3] rnnoise: 2020-06-28 -> 2021-01-22 This adds the `rnnoise_destroy` symbol which is needed by newer PulseEffects. --- pkgs/development/libraries/rnnoise/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix index 4dec2f3cfcb..ad587f0f583 100644 --- a/pkgs/development/libraries/rnnoise/default.nix +++ b/pkgs/development/libraries/rnnoise/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (rec { pname = "rnnoise"; - version = "2020-06-28"; + version = "2021-01-22"; src = fetchFromGitHub { owner = "xiph"; repo = "rnnoise"; - rev = "90ec41ef659fd82cfec2103e9bb7fc235e9ea66c"; - sha256 = "02z6qzjajhlpsb80lwl7cqqga9hm638psnqnppjkw84w4lrp15ny"; + rev = "1cbdbcf1283499bbb2230a6b0f126eb9b236defd"; + sha256 = "1y0rzgmvy8bf9a431garpm2w177s6ajgf79y5ymw4yb0pik57rwb"; }; nativeBuildInputs = [ autoreconfHook ]; From 6b8a6e6fcedaddb1a232bca640578581a2a67040 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sun, 28 Mar 2021 17:58:58 -0400 Subject: [PATCH 2/3] pulseeffects: 5.0.0 -> 5.0.2 Many bugfixes. Also enable separate debug info as better crash reports will be helpful for the new 5 series. --- .../audio/pulseeffects/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 0ba926fab4f..9187b380f01 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config @@ -45,13 +46,16 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "5.0.0"; + + # 5.0.3 crashes. Test carefully before updating. + # https://github.com/wwmm/pulseeffects/issues/927 + version = "5.0.2"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1zs13bivxlgcb24lz1pgmgy2chcjxnmn4lz7g1n0ygiaaj4c30xj"; + sha256 = "14ir25q6bws26im6qmj3k6hkfdh5pc6mbvln7wkdwy5dv0vix3cm"; }; nativeBuildInputs = [ @@ -87,6 +91,15 @@ in stdenv.mkDerivation rec { zita-convolver ]; + patches = [ + (fetchpatch { + # Fix build failure. + # https://github.com/wwmm/pulseeffects/pull/934 + url = "https://github.com/wwmm/pulseeffects/commit/ab7354a6850d23840b4c9af212dbebf4f31a562f.patch"; + sha256 = "1hd05xn6sp0xs632mqgwk19hl40kh2f69mx5mgzahysrj057w22c"; + }) + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py @@ -104,6 +117,8 @@ in stdenv.mkDerivation rec { BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + separateDebugInfo = true; + meta = with lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; homepage = "https://github.com/wwmm/pulseeffects"; From c371cdee249afd66f4064d72c3c27aa4da792e4d Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sun, 28 Mar 2021 18:18:57 -0400 Subject: [PATCH 3/3] pulseeffects: formatting Co-authored-by: Sandro --- pkgs/applications/audio/pulseeffects/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 9187b380f01..33b15e977e7 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -46,7 +46,6 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - # 5.0.3 crashes. Test carefully before updating. # https://github.com/wwmm/pulseeffects/issues/927 version = "5.0.2";