Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 30cfe8d5f10d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8b0f365582ee
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 7, 2019

  1. chromaprint: 1.3.2 -> 1.4.3 

    Changed upstream URL to GitHub. The latest release is not on BitBucket
and the web site points to GitHub.
    @dsg22
    dsg22 committed Oct 7, 2019
    Copy the full SHA
    128fc2a View commit details

Commits on Oct 18, 2019

  1. clementine: fix build w/ chromaprint 1.4+

    @c0bw3b
    c0bw3b authored Oct 18, 2019
    Copy the full SHA
    330806a View commit details

  2. Merge pull request #70658 from dsg22/feature-chromaprint-1.4.3 

    chromaprint: 1.3.2 -> 1.4.3
    @c0bw3b
    c0bw3b authored Oct 18, 2019
    Copy the full SHA
    8b0f365 View commit details
Showing with 9 additions and 4 deletions.
  1. +5 −0 pkgs/applications/audio/clementine/default.nix
  2. +4 −4 pkgs/development/libraries/chromaprint/default.nix
5 changes: 5 additions & 0 deletions pkgs/applications/audio/clementine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
8 changes: 4 additions & 4 deletions pkgs/development/libraries/chromaprint/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;