public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111633 from dotlambda/libkeyfinder-2.2.4

Browse Source
This commit is contained in:
Sandro
2021-02-04 18:39:29 +01:00
committed by GitHub
parent 5c2d5b3a0b f1bbe7f29e
commit 7f0ed95d2b
3 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libkeyfinder/default.nix
+15 -20
View File
@@ -1,37 +1,32 @@
{ lib, stdenv, fetchFromGitHub, fftw, qtbase, qmake }: { lib, stdenv, fetchFromGitHub, cmake, fftw, catch2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libkeyfinder"; pname = "libkeyfinder";
version = "2.1"; version = "2.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "07kc0cl6kirgmpdgkgmp6r3yvyf7b1w569z01g8rfl1cig80qdc7"; owner = "mixxxdj";
repo = "libkeyfinder";
rev = "v${version}"; rev = "v${version}";
repo = "libKeyFinder"; sha256 = "005qq81xfzi1iifvpgkqpizxcrfisafq2r0cjp4fxqh1ih7bfimv";
owner = "ibsh";
}; };
nativeBuildInputs = [ qmake ]; # needed for linking libkeyfinder.so into keyfinder-tests executable
buildInputs = [ fftw qtbase ]; preBuild = ''
export LD_LIBRARY_PATH=$(pwd)
postPatch = ''
substituteInPlace LibKeyFinder.pro \
--replace "/usr/local" "$out" \
--replace "-stdlib=libc++" ""
''; '';
enableParallelBuilding = true; nativeBuildInputs = [ cmake ];
postInstall = '' buildInputs = [ fftw ];
mkdir -p $out/include/keyfinder
install -m644 *.h $out/include/keyfinder checkInputs = [ catch2 ];
mkdir -p $out/lib
cp -a lib*.so* $out/lib doCheck = true;
'';
meta = with lib; { meta = with lib; {
description = "Musical key detection for digital audio (C++ library)"; 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; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
pkgs/top-level/all-packages.nix
+3 -1
View File
@@ -15140,6 +15140,8 @@ in
libkate = callPackage ../development/libraries/libkate { }; libkate = callPackage ../development/libraries/libkate { };
libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
libkml = callPackage ../development/libraries/libkml { }; libkml = callPackage ../development/libraries/libkml { };
libksba = callPackage ../development/libraries/libksba { }; libksba = callPackage ../development/libraries/libksba { };
@@ -23061,7 +23063,7 @@ in
keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { };
keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { };
kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { };
pkgs/top-level/qt5-packages.nix
-2
View File
@@ -95,8 +95,6 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 //
libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
libktorrent = callPackage ../development/libraries/libktorrent { }; libktorrent = callPackage ../development/libraries/libktorrent { };
liblastfm = callPackage ../development/libraries/liblastfm { }; liblastfm = callPackage ../development/libraries/liblastfm { };