ardour: 6.5 -> 6.7

This commit is contained in:
Bart Brouns 2021-05-22 02:18:32 +02:00 committed by Jonathan Ringer
parent f55c2cd9cd
commit 8c9a799bca
1 changed files with 6 additions and 6 deletions

View File

@ -8,7 +8,7 @@
, curl , curl
, dbus , dbus
, doxygen , doxygen
, ffmpeg_3 , ffmpeg
, fftw , fftw
, fftwSinglePrec , fftwSinglePrec
, flac , flac
@ -56,13 +56,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ardour"; pname = "ardour";
version = "6.5"; version = "6.7";
# don't fetch releases from the GitHub mirror, they are broken # don't fetch releases from the GitHub mirror, they are broken
src = fetchgit { src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git"; url = "git://git.ardour.org/ardour/ardour.git";
rev = version; rev = version;
sha256 = "0sd38hchyr16biq9hcxha4ljy3pf0yhcgn90i5zfqcznnc57ildx"; sha256 = "19jc29fjwgvqbg3gnmy50mrz8mh5x4nwddglasvwx83nc87qwllx";
}; };
patches = [ patches = [
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
cppunit cppunit
curl curl
dbus dbus
ffmpeg_3 ffmpeg
fftw fftw
fftwSinglePrec fftwSinglePrec
flac flac
@ -148,8 +148,8 @@ stdenv.mkDerivation rec {
sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
patchShebangs ./tools/ patchShebangs ./tools/
substituteInPlace libs/ardour/video_tools_paths.cc \ substituteInPlace libs/ardour/video_tools_paths.cc \
--replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg_3}/bin/ffmpeg");' \ --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
--replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg_3}/bin/ffprobe");' --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
''; '';
postInstall = '' postInstall = ''