diff options
| author | Orivej Desh <orivej@gmx.fr> | 2023-03-24 07:19:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-24 07:19:13 +0000 |
| commit | ad6a206d1bf507656beb8b977c6434721a3ab5a1 (patch) | |
| tree | 6b6008274a2cda6e6cfc22a9bd8b1279c9ef7ecf | |
| parent | 3bfa9ed74d7dae0700404346c4eb04d7c2b3b78b (diff) | |
| download | nixpkgs-ad6a206d1bf507656beb8b977c6434721a3ab5a1.tar nixpkgs-ad6a206d1bf507656beb8b977c6434721a3ab5a1.tar.gz nixpkgs-ad6a206d1bf507656beb8b977c6434721a3ab5a1.tar.bz2 nixpkgs-ad6a206d1bf507656beb8b977c6434721a3ab5a1.tar.lz nixpkgs-ad6a206d1bf507656beb8b977c6434721a3ab5a1.tar.xz nixpkgs-ad6a206d1bf507656beb8b977c6434721a3ab5a1.tar.zst nixpkgs-ad6a206d1bf507656beb8b977c6434721a3ab5a1.zip | |
sonic-lineup: fix build (#222408)
| -rw-r--r-- | pkgs/applications/audio/sonic-lineup/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/audio/sonic-lineup/match-vamp.patch | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 23 insertions, 7 deletions
diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index d795138a4b5..6ea4bcd6628 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsa-lib, boost, bzip2, fftw, fftwFloat, libfishsound +{ lib, stdenv, fetchurl, fetchpatch2, alsa-lib, boost, bzip2, fftw, fftwFloat, libfishsound , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto , wrapQtAppsHook, pkg-config @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { sha256 = "0k45k9fawcm4s5yy05x00pgww7j8m7k2cxcc7g0fn9vqy7vcbq9h"; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/sonic-visualiser/svcore/commit/5a7b517e43b7f0b3f03b7fc3145102cf4e5b0ffc.patch"; + stripLen = 1; + extraPrefix = "svcore/"; + sha256 = "sha256-DOCdQqCihkR0g/6m90DbJxw00QTpyVmFzCxagrVWKiI="; + }) + ./match-vamp.patch + ]; + buildInputs = [ alsa-lib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo libmad liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile @@ -36,7 +46,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.vandenoever ]; platforms = platforms.linux; - # undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.4.29' - broken = true; # at 2022-09-30 }; } diff --git a/pkgs/applications/audio/sonic-lineup/match-vamp.patch b/pkgs/applications/audio/sonic-lineup/match-vamp.patch new file mode 100644 index 00000000000..03e9b54acd9 --- /dev/null +++ b/pkgs/applications/audio/sonic-lineup/match-vamp.patch @@ -0,0 +1,11 @@ +--- a/match/src/FullDTW.h ++++ b/match/src/FullDTW.h +@@ -83,7 +83,7 @@ + * against the best-matching subsequence of s1; otherwise it is + * against the whole of s1. + */ +- std::vector<size_t> align(const featureseq_t &s1, ++ std::vector<std::size_t> align(const featureseq_t &s1, + const featureseq_t &s2); + + private: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0692fe0458..47e9488aa99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33482,10 +33482,7 @@ with pkgs; socialscan = with python3.pkgs; toPythonApplication socialscan; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { - bzip2 = bzip2_1_1; - stdenv = gcc10StdenvCompat; - }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; |