nanodbc: 2.13.0 -> 2.14.0 and fix build

+7 -12
+7 -12
pkgs/development/libraries/nanodbc/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, cmake, unixODBC }: 1 + { lib, stdenv, fetchFromGitHub, catch2, cmake, unixODBC }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "nanodbc"; 5 - version = "2.13.0"; 5 + version = "2.14.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "nanodbc"; 9 9 repo = "nanodbc"; 10 10 rev = "v${version}"; 11 - sha256 = "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm"; 11 + hash = "sha256-dVUOwA7LfLqcQq2nc6OAha0krmgTy5RUHupBVrNdo4g="; 12 12 }; 13 + 14 + postPatch = '' 15 + cp ${catch2}/include/catch2/catch.hpp test/catch/catch.hpp 16 + ''; 13 17 14 18 nativeBuildInputs = [ cmake ]; 15 19 ··· 19 23 [ "-DBUILD_STATIC_LIBS=ON" ] 20 24 else 21 25 [ "-DBUILD_SHARED_LIBS=ON" ]; 22 - 23 - # fix compilation on macOS 24 - # https://github.com/nanodbc/nanodbc/issues/274 25 - # remove after the next version update 26 - postUnpack = if stdenv.isDarwin then '' 27 - mv $sourceRoot/VERSION $sourceRoot/VERSION.txt 28 - substituteInPlace $sourceRoot/CMakeLists.txt \ 29 - --replace 'file(STRINGS VERSION' 'file(STRINGS VERSION.txt' 30 - '' else ""; 31 26 32 27 meta = with lib; { 33 28 homepage = "https://github.com/nanodbc/nanodbc";