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

ardour(2): fix and minor update.

Browse Source 
- use fetchurl from Gentoo mirror instead of failing SVN fetch
- minor version update
- use system libraries as much as possible
- fix building
This commit is contained in:
Vladimír Čunát 2013-03-02 21:17:30 +01:00
parent face3a8242
commit d9a2b1f520
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/applications/audio/ardour/default.nix
View File

@ -1,44 +1,37 @@
{ stdenv, fetchsvn, scons, boost, pkgconfig, fftw, librdf_raptor { stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor2
, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2 , librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
, lilv, lv2, serd, sord, sratom, suil # these are probably optional
, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango , libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
, gtk, glibmm, gtkmm, libgnomecanvas, liblo, aubio , gtk, glibmm, gtkmm, libgnomecanvas, libgnomecanvasmm, liblo, aubio
, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf }: , fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ardour-${version}"; name = "ardour-${version}";
version = "2.8.12"; version = "2.8.16";
# svn is the source to get official releases from their site? src = fetchurl {
# alternative: wget --data-urlencode 'key=7c4b2e1df903aae5ff5cc4077cda801e' http://ardour.org/downloader url = "mirror://gentoo/distfiles/${name}.tar.bz2";
# but hash is changing ? sha256 = "0h2y0x4yznalllja53anjil2gmgcb26f39zshc4gl1d1kc8k5vip";
# TODO: see if this is also true when using a tag (~goibhniu)
# This version does not run it exits with the following error:
# raptor_new_uri_for_rdf_concept called with Raptor V1 world object
# raptor_general.c:240:raptor_init: fatal error: raptor_init() failedAborted
src = fetchsvn {
url = "http://subversion.ardour.org/svn/ardour2/tags/${version}";
sha256 = "0d4y8bv12kb0yd2srvxn5388sa4cl5d5rk381saj9f3jgpiciyky";
}; };
patchPhase = '' postPatch = ''
sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh #sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh
echo '#include "ardour/svn_revision.h"' > libs/ardour/svn_revision.cc echo '#include "ardour/svn_revision.h"' > libs/ardour/svn_revision.cc
echo -e 'namespace ARDOUR {\n extern const char* svn_revision = "2.8.12";\n }\n' >> libs/ardour/svn_revision.cc echo -e 'namespace ARDOUR {\n extern const char* svn_revision = "2.8.12";\n }\n' >> libs/ardour/svn_revision.cc
''; '';
buildInputs = [ buildInputs = [
scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio scons boost pkgconfig fftw librdf_raptor2 librdf_rasqal jackaudio
flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas liblrdf #lilv lv2 serd sord sratom suil
liblo aubio fftwSinglePrec libmad autoconf automake libtool libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas libgnomecanvasmm liblrdf
liblo aubio fftwSinglePrec libmad autoconf automake libtool curl
]; ];
buildPhase = '' buildPhase = ''
mkdir -p $out mkdir -p $out
export CXX=g++ export CXX=g++
scons PREFIX=$out install scons PREFIX=$out SYSLIBS=1 install
''; '';
installPhase = ":"; installPhase = ":";

2
pkgs/top-level/all-packages.nix
View File

@ -6525,7 +6525,7 @@ let
antiword = callPackage ../applications/office/antiword {}; antiword = callPackage ../applications/office/antiword {};
ardour = callPackage ../applications/audio/ardour { ardour = callPackage ../applications/audio/ardour {
inherit (gnome) libgnomecanvas; inherit (gnome) libgnomecanvas libgnomecanvasmm;
}; };
ardour3 = lowPrio (callPackage ../applications/audio/ardour/ardour3.nix { ardour3 = lowPrio (callPackage ../applications/audio/ardour/ardour3.nix {