ardour: make ardour3 the default and remove ardour 2, it doesn't build

pkgs/applications/audio/ardour/ardour3.nix

@@ -1,62 +0,0 @@
-{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
-, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
-, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
-, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, perl, pkgconfig, python, serd, sord, sratom, suil }:
-
-let
-  tag = "3.5.357";
-in
-
-stdenv.mkDerivation rec {
-  name = "ardour-${tag}";
-
-  src = fetchgit {
-    url = git://git.ardour.org/ardour/ardour.git;
-    rev = "refs/tags/${tag}";
-    sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42";
-  };
-
-  buildInputs = 
-    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
-      glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
-      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
-      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
-      makeWrapper pango perl pkgconfig python serd sord sratom suil
-    ];
-
-  patchPhase = ''
-    # The funny revision number is from `git describe rev`
-    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc
-    # Note the different version number
-    sed -i '33i rev = \"3.5-357-gce4d125\"' wscript
-    sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
-    sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
-    sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
-  '';
-
-  configurePhase = "python waf configure --optimize --prefix=$out";
-
-  buildPhase = "python waf";
-
-  # For the custom ardour clearlooks gtk-engine to work, it must be
-  # moved to a directory called "engines" and added to GTK_PATH
-  installPhase = ''
-    python waf install
-    mkdir -pv $out/gtk2/engines
-    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
-    wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Multi-track hard disk recording software";
-    longDescription = ''
-      Also read "The importance of Paying Something" on their homepage, please!
-    '';
-    homepage = http://ardour.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}

pkgs/applications/audio/ardour/default.nix

@@ -1,51 +1,62 @@
-{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor2
+{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
-, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
+, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio
-, lilv, lv2, serd, sord, sratom, suil # these are probably optional
+, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
-, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
+, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, gtk, glibmm, gtkmm, libgnomecanvas, libgnomecanvasmm, liblo, aubio
+, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf, curl }:
+, perl, pkgconfig, python, serd, sord, sratom, suil }:
+
+let
+  tag = "3.5.357";
+in
 
 stdenv.mkDerivation rec {
-  name = "ardour-${version}";
+  name = "ardour-${tag}";
-  version = "2.8.16";
 
-  src = fetchurl {
+  src = fetchgit {
-    url = "mirror://gentoo/distfiles/${name}.tar.bz2";
+    url = git://git.ardour.org/ardour/ardour.git;
-    sha256 = "0h2y0x4yznalllja53anjil2gmgcb26f39zshc4gl1d1kc8k5vip";
+    rev = "refs/tags/${tag}";
+    sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42";
   };
 
-  postPatch = ''
+  buildInputs = 
-    #sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh
+    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
-    echo '#include "ardour/svn_revision.h"' > libs/ardour/svn_revision.cc
+      glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo
-    echo -e 'namespace ARDOUR {\n extern const char* svn_revision = "2.8.12";\n }\n' >> libs/ardour/svn_revision.cc
+      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
-  '';
+      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
-
+      makeWrapper pango perl pkgconfig python serd sord sratom suil
-  buildInputs = [
-    scons boost pkgconfig fftw librdf_raptor2 librdf_rasqal jackaudio
-    flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
-    #lilv lv2 serd sord sratom suil
-    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas libgnomecanvasmm liblrdf
-    liblo aubio fftwSinglePrec libmad autoconf automake libtool curl
     ];
 
-  buildPhase = ''
+  patchPhase = ''
-    mkdir -p $out
+    # The funny revision number is from `git describe rev`
-    export CXX=g++
+    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc
-    scons PREFIX=$out SYSLIBS=1 install
+    # Note the different version number
+    sed -i '33i rev = \"3.5-357-gce4d125\"' wscript
+    sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
+    sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
+    sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
   '';
 
-  installPhase = ":";
+  configurePhase = "python waf configure --optimize --prefix=$out";
 
-  meta = {
+  buildPhase = "python waf";
+
+  # For the custom ardour clearlooks gtk-engine to work, it must be
+  # moved to a directory called "engines" and added to GTK_PATH
+  installPhase = ''
+    python waf install
+    mkdir -pv $out/gtk2/engines
+    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
+    wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
+  '';
+
+  meta = with stdenv.lib; {
     description = "Multi-track hard disk recording software";
     longDescription = ''
-      Broken: use ardour3-svn instead
       Also read "The importance of Paying Something" on their homepage, please!
     '';
     homepage = http://ardour.org/;
-    branch  = "2";
+    license = licenses.gpl2;
-    license = "GPLv2";
+    platforms = platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    maintainers = [ maintainers.goibhniu ];
-    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/top-level/all-packages.nix

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