libkeyfinder: 2.1 -> 2.2.4

Also move to all-packages.nix since it does not use qmake anymore.

1 files changed, 15 insertions, 20 deletions

diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index d2aecccdedf..85747f2f38d 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,37 +1,32 @@
-{ lib, stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
+{ lib, stdenv, fetchFromGitHub, cmake, fftw, catch2 }:
 
 stdenv.mkDerivation rec {
   pname = "libkeyfinder";
-  version = "2.1";
+  version = "2.2.4";
 
   src = fetchFromGitHub {
-    sha256 = "07kc0cl6kirgmpdgkgmp6r3yvyf7b1w569z01g8rfl1cig80qdc7";
+    owner = "mixxxdj";
+    repo = "libkeyfinder";
     rev = "v${version}";
-    repo = "libKeyFinder";
-    owner = "ibsh";
+    sha256 = "005qq81xfzi1iifvpgkqpizxcrfisafq2r0cjp4fxqh1ih7bfimv";
   };
 
-  nativeBuildInputs = [ qmake ];
-  buildInputs = [ fftw qtbase ];
-
-  postPatch = ''
-    substituteInPlace LibKeyFinder.pro \
-      --replace "/usr/local" "$out" \
-      --replace "-stdlib=libc++" ""
+  # needed for linking libkeyfinder.so into keyfinder-tests executable
+  preBuild = ''
+    export LD_LIBRARY_PATH=$(pwd)
   '';
 
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
 
-  postInstall = ''
-    mkdir -p $out/include/keyfinder
-    install -m644 *.h $out/include/keyfinder
-    mkdir -p $out/lib
-    cp -a lib*.so* $out/lib
-  '';
+  buildInputs = [ fftw ];
+
+  checkInputs = [ catch2 ];
+
+  doCheck = true;
 
   meta = with lib; {
     description = "Musical key detection for digital audio (C++ library)";
-    homepage = "http://www.ibrahimshaath.co.uk/keyfinder/";
+    homepage = "https://mixxxdj.github.io/libkeyfinder/";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };