Unverified Commit 0aeb88aa authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

libkeyfinder: 2.2.6 -> 2.2.8; keyfinder-cli: 1.1.1 -> 1.1.2 (#338715)

parents bc409635 fa2686d9
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder }:
{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libkeyfinder, fftw }:

stdenv.mkDerivation rec {
  pname = "keyfinder-cli";
  version = "1.1.1";
  version = "1.1.2";

  src = fetchFromGitHub {
    repo = "keyfinder-cli";
    owner = "EvanPurkhiser";
    rev = "v${version}";
    sha256 = "1mlcygbj3gqii3cz8jd6ks1lz612i4jp0343qjg293xm39fg47ns";
    hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA=";
  };

  buildInputs = [ ffmpeg libkeyfinder ];
  buildInputs = [ ffmpeg_7 libkeyfinder fftw ];

  makeFlags = [ "PREFIX=$(out)" ];

+5 −14
Original line number Diff line number Diff line
{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2 }:
{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2_3 }:

stdenv.mkDerivation rec {
  pname = "libkeyfinder";
  version = "2.2.6";
  version = "2.2.8";

  src = fetchFromGitHub {
    owner = "mixxxdj";
    repo = "libkeyfinder";
    rev = "v${version}";
    sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg=";
    rev = version;
    hash = "sha256-Et8u5j/ke9u2bwHFriPCCBiXkPel37gwx+kwuViAr4o=";
  };

  # in main post 2.2.6, see https://github.com/mixxxdj/libkeyfinder/issues/21
  patches = [
    (fetchpatch {
      name = "fix-pkg-config";
      url = "https://github.com/mixxxdj/libkeyfinder/commit/4e1a5022d4c91e3ecfe9be5c3ac7cc488093bd2e.patch";
      sha256 = "08llmgp6r11bq5s820j3fs9bgriaibkhq8r3v2av064w66mwp48x";
    })
  ];

  nativeBuildInputs = [ cmake ];

  buildInputs = [ fftw ];

  nativeCheckInputs = [ catch2 ];
  nativeCheckInputs = [ catch2_3 ];

  doCheck = true;