diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2019-10-18 23:12:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 23:12:13 +0200 |
| commit | 8b0f365582ee53628788b864b946965e6ccf3a7e (patch) | |
| tree | 84ae7d99100db4e0225ba8d100859c33a7c6fe92 /pkgs | |
| parent | 30cfe8d5f10dac3f6184fd6ff611b552343d1b78 (diff) | |
| parent | 330806a893234e7de93f6c93143f6af851cc8d8f (diff) | |
| download | nixpkgs-8b0f365582ee53628788b864b946965e6ccf3a7e.tar nixpkgs-8b0f365582ee53628788b864b946965e6ccf3a7e.tar.gz nixpkgs-8b0f365582ee53628788b864b946965e6ccf3a7e.tar.bz2 nixpkgs-8b0f365582ee53628788b864b946965e6ccf3a7e.tar.lz nixpkgs-8b0f365582ee53628788b864b946965e6ccf3a7e.tar.xz nixpkgs-8b0f365582ee53628788b864b946965e6ccf3a7e.tar.zst nixpkgs-8b0f365582ee53628788b864b946965e6ccf3a7e.zip | |
Merge pull request #70658 from dsg22/feature-chromaprint-1.4.3
chromaprint: 1.3.2 -> 1.4.3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/clementine/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/chromaprint/default.nix | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index f48a429b389..0a374c26142 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -28,6 +28,11 @@ let url = "https://github.com/clementine-player/Clementine/pull/5630.patch"; sha256 = "0px7xp1m4nvrncx8sga1qlxppk562wrk2qqk19iiry84nxg20mk4"; }) + (fetchpatch { + # Fixes compilation with chromaprint >= 1.4 + url = "https://github.com/clementine-player/Clementine/commit/d3ea0c8482dfd3f6264a30cfceb456076d76e6cd.patch"; + sha256 = "1ifrs5aqdzw16jbnf0z1ilir20chdnr9k5n21r99miq9hzjpbh12"; + }) ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index fd868884f98..6ad6a09ec14 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "chromaprint"; - version = "1.3.2"; + version = "1.4.3"; src = fetchurl { - url = "https://bitbucket.org/acoustid/chromaprint/downloads/${pname}-${version}.tar.gz"; - sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3"; + url = "https://github.com/acoustid/chromaprint/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "10kz8lncal4s2rp2rqpgc6xyjp0jzcrihgkx7chf127vfs5n067a"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ boost ffmpeg ]; - cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ]; + cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; meta = with stdenv.lib; { homepage = https://acoustid.org/chromaprint; |