diff options
| -rw-r--r-- | pkgs/applications/audio/ardour/default.nix | 85 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 41 insertions, 48 deletions
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index c47375d593804..a17f4aa16486b 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -13,26 +13,24 @@ , graphviz , gtkmm2 , libjack2 -, libgnomecanvas -, libgnomecanvasmm , liblo -, libmad , libogg -, librdf_raptor -, librdf_rasqal , libsamplerate , libsigcxx , libsndfile -, libusb -, libuuid +, libusb1 +, fluidsynth_1 +, hidapi +, libltc +, qm-dsp , libxml2 -, libxslt , lilv , lrdf , lv2 , makeWrapper , perl -, pkgconfig +, pkg-config +, itstool , python2 , rubberband , serd @@ -68,6 +66,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ wafHook + makeWrapper + pkg-config + itstool + doxygen + graphviz # for dot + perl + python2 ]; buildInputs = [ @@ -76,37 +81,28 @@ in stdenv.mkDerivation rec { boost cairomm curl - doxygen dbus fftw fftwSinglePrec flac glibmm - graphviz gtkmm2 libjack2 - libgnomecanvas - libgnomecanvasmm liblo - libmad libogg - librdf_raptor - librdf_rasqal libsamplerate libsigcxx libsndfile - libusb - libuuid + libusb1 + fluidsynth_1 + hidapi + libltc + qm-dsp libxml2 - libxslt lilv lrdf lv2 - makeWrapper pango - perl - pkgconfig - python2 rubberband serd sord @@ -117,36 +113,35 @@ in stdenv.mkDerivation rec { libarchive ]; + wafConfigureFlags = [ + "--optimize" + "--docs" + "--use-external-libs" + "--freedesktop" + "--with-backends=jack,alsa,dummy" + ]; + + NIX_CFLAGS_COMPILE = "-I${qm-dsp}/include/qm-dsp"; + # 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 # have to do that ourself. - patchPhase = '' + postPatch = '' printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript patchShebangs ./tools/ ''; - wafConfigureFlags = [ - "--optimize" - "--docs" - "--with-backends=jack,alsa,dummy" - ]; - postInstall = '' - # Install desktop file - mkdir -p "$out/share/applications" - cat > "$out/share/applications/ardour.desktop" << EOF - [Desktop Entry] - Name=Ardour 5 - GenericName=Digital Audio Workstation - Comment=Multitrack harddisk recorder - Exec=$out/bin/ardour5 - Icon=$out/share/ardour5/resources/Ardour-icon_256px.png - Terminal=false - Type=Application - X-MultipleArgs=false - Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; - EOF + # wscript does not install these for some reason + install -vDm 644 "build/gtk2_ardour/ardour.xml" \ + -t "$out/share/mime/packages" + install -vDm 644 "build/gtk2_ardour/ardour5.desktop" \ + -t "$out/share/applications" + for size in 16 22 32 48 256 512; do + install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \ + "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour5.png" + done + install -vDm 644 "ardour.1"* -t "$out/share/man/man1" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffb4b1c85e4ea..64eee32b5aa06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18405,9 +18405,7 @@ in aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; - ardour = callPackage ../applications/audio/ardour { - inherit (gnome2) libgnomecanvas libgnomecanvasmm; - }; + ardour = callPackage ../applications/audio/ardour { }; arelle = with python3Packages; toPythonApplication arelle; |