diff --git a/pkgs/by-name/li/libdjinterop/package.nix b/pkgs/by-name/li/libdjinterop/package.nix index 39a567f33569..13d76010086d 100644 --- a/pkgs/by-name/li/libdjinterop/package.nix +++ b/pkgs/by-name/li/libdjinterop/package.nix @@ -3,10 +3,12 @@ stdenv, fetchFromGitHub, fetchpatch2, + testers, + validatePkgConfig, boost, cmake, + howard-hinnant-date, ninja, - pkg-config, sqlite, zlib, }: @@ -14,27 +16,34 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdjinterop"; - version = "0.26.1"; + version = "0.27.1"; src = fetchFromGitHub { owner = "xsco"; repo = "libdjinterop"; rev = finalAttrs.version; - hash = "sha256-HwNhCemqVR1xNSbcht0AuwTfpRhVi70ZH5ksSTSRFoc="; + hash = "sha256-Uiz2VZef0+H9NfPgOPT1XVBKCiTXC/n8VKVveXEy40c="; }; patches = [ - # https://github.com/xsco/libdjinterop/pull/161 + # https://github.com/xsco/libdjinterop/pull/188 + # adds options to use system howard-hinnant-date and sqlite_modern_cpp + # additionally bumps version in CMakeLists.txt, fixed in postPatch (fetchpatch2 { - url = "https://github.com/xsco/libdjinterop/commit/94ce315cd5155bd031eeccfec12fbeb8e399dd14.patch"; - hash = "sha256-WahMsFeetSlHHiIyaC04YxTiXDxD1ooASqoIP2TK9R0="; + url = "https://github.com/xsco/libdjinterop/commit/d21f713440633e41d37df14c8e5cc16be7595a7a.patch"; + hash = "sha256-QPgSU1BYl+RAb3sJn5LkbqovhBgCLYw44+d8pr7Tx3M="; }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "VERSION 0.27.2" "VERSION ${finalAttrs.version}" + ''; + nativeBuildInputs = [ cmake ninja - pkg-config + validatePkgConfig ]; outputs = [ @@ -44,15 +53,39 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost + howard-hinnant-date sqlite zlib ]; + propagatedBuildInputs = [ + howard-hinnant-date + sqlite + zlib + ]; + + strictDeps = true; + + cmakeFlags = [ + (lib.cmakeBool "SYSTEM_DATE_H" true) + ]; + + doCheck = true; + + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "DjInterop" ]; + }; + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + }; + meta = { homepage = "https://github.com/xsco/libdjinterop"; description = "C++ library for access to DJ record libraries"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ benley ]; platforms = lib.platforms.unix; + pkgConfigModules = [ "djinterop" ]; }; }) diff --git a/pkgs/by-name/mi/mixxx/package.nix b/pkgs/by-name/mi/mixxx/package.nix index 56fe90569eef..64def560d5c0 100644 --- a/pkgs/by-name/mi/mixxx/package.nix +++ b/pkgs/by-name/mi/mixxx/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { # Should be removed when bumping to 2.6.x postPatch = '' substituteInPlace CMakeLists.txt \ - --replace-warn "LIBDJINTEROP_VERSION 0.24.3" "LIBDJINTEROP_VERSION 0.26.1" + --replace-warn "LIBDJINTEROP_VERSION 0.24.3" "LIBDJINTEROP_VERSION ${libdjinterop.version}" ''; nativeBuildInputs = [