From c8900990a703c72e98cb2ec2b02b367f3135204f Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Fri, 16 Mar 2012 22:28:21 +0000
Subject: [PATCH] Updating ardour to the 2.8.12 svn tag (2.8.2 doesn't
compile), hopefully this works although the comment from Marc Weber suggests
that the hash will change over time. This builds for me but fails to start
giving 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
https://qa.mandriva.com/show_bug.cgi?id=65072 looks similar, but adding liblrdf (0.4.0) as an input, doesn't help.
svn path=/nixpkgs/trunk/; revision=33181
---
pkgs/applications/audio/ardour/default.nix | 25 +++++++++++++++-------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 2a0caf930015..f60a0002b7b2 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,25 +1,34 @@
-{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor
+{ stdenv, fetchsvn, scons, boost, pkgconfig, fftw, librdf_raptor
, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
, gtk, glibmm, gtkmm, libgnomecanvas, librdf, liblo, aubio
-, fftwSinglePrec, libmad }:
+, fftwSinglePrec, libmad, automake, autoconf, liblrdf, libtool }:
-stdenv.mkDerivation {
- name = "ardour-2.8.2";
+stdenv.mkDerivation rec {
+ name = "ardour-${version}";
+ version = "2.8.12";
# svn is the source to get official releases from their site?
# alternative: wget --data-urlencode 'key=7c4b2e1df903aae5ff5cc4077cda801e' http://ardour.org/downloader
# but hash is changing ?
- src = fetchurl {
- url = http://mawercer.de/~nix/ardour-2.8.2.tar.bz2;
- sha256 = "1igwv1r6rlybdac24qady5asaf34f9k7kawkkgyvsifhl984m735";
+
+ # TODO: see if this is also true when using a tag (~goibhniu)
+ src = fetchsvn {
+ url = "http://subversion.ardour.org/svn/ardour2/tags/${version}";
+ sha256 = "0d4y8bv12kb0yd2srvxn5388sa4cl5d5rk381saj9f3jgpiciyky";
};
+ patchPhase = ''
+ 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 -e 'namespace ARDOUR {\n extern const char* svn_revision = "2.8.12";\n }\n' >> libs/ardour/svn_revision.cc
+ '';
+
buildInputs = [
scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas librdf
- liblo aubio fftwSinglePrec libmad
+ liblo aubio fftwSinglePrec libmad autoconf automake liblrdf libtool
];
buildPhase = ''