Merge pull request #13511 from magnetophon/ardour-4.7

ardour: 4.4-> 4.7
This commit is contained in:
Arseniy Seroka 2016-02-27 22:46:04 +03:00
commit a6347a3477

View file

@ -15,7 +15,7 @@ let
# "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
# Version to build. # Version to build.
tag = "4.4"; tag = "4.7";
in in
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Ardour"; owner = "Ardour";
repo = "ardour"; repo = "ardour";
rev = "b00d75adf63db155ef2873bd9d259dc8ca256be6"; rev = "d84a8222f2b6dab5028b2586f798535a8766670e";
sha256 = "1gnrcnq2ksnh7fsa301v1c4p5dqrbqpjylf02rg3za3ab58wxi7l"; sha256 = "149gswphz77m3pkzsn2nqbm6yvcfa3fva560bcvjzlgb73f64q5l";
}; };
buildInputs = buildInputs =
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
]; ];
# ardour's wscript has a "tarball" target but that required the git revision # ardour's wscript has a "tarball" target but that required the git revision
# be available. Since this is an unzipped tarball fetched from github we # be available. Since this is an unzipped tarball fetched from github we
# have to do that ourself. # have to do that ourself.
patchPhase = '' patchPhase = ''
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc