Author: raskin
Date: Sun Jan 2 17:13:34 2011
New Revision: 25340
URL: https://svn.nixos.org/websvn/nix/?rev=25340&sc=1
Log:
Try fixing Audacity
Modified:
nixpkgs/trunk/pkgs/applications/audio/audacity/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/audio/audacity/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/audio/audacity/default.nix Sun Jan 2
16:35:14 2011 (r25339)
+++ nixpkgs/trunk/pkgs/applications/audio/audacity/default.nix Sun Jan 2
17:13:34 2011 (r25340)
@@ -1,18 +1,31 @@
{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
- libogg, libvorbis, libmad
+ libogg, libvorbis, libmad, alsaLib, libsndfile, libsamplerate, flac, lame,
+ expat, id3lib, ffmpeg
}:
-stdenv.mkDerivation {
- name = "audacity-1.3.7";
+stdenv.mkDerivation rec {
+ version = "1.3.12";
+ name = "audacity-${version}";
NIX_CFLAGS_COMPILE = "-fPIC -lgtk-x11-2.0 -lglib-2.0 -lgobject-2.0 -lz";
src = fetchurl {
- url = mirror://sourceforge/audacity/audacity-fullsrc-1.3.7.tar.bz2;
- sha256 = "0b4arafpdyjjk52l6n7aw518hzm65iv9w5g39jqr2bmvn6a9qivi";
+ url =
"mirror://sourceforge/audacity/audacity-minsrc-${version}-beta.tar.bz2";
+ sha256 =
"f0f55839ca3013d2e43e5114c73d195bc34503685aeab683eafca4d1bbf3b768";
};
buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib intltool perl
- libogg libvorbis libmad];
+ libogg libvorbis libmad alsaLib libsndfile libsamplerate flac lame
+ expat id3lib ffmpeg];
+
+ configureFlags = [
+ "--with-portmixer=no"
+ ];
+
+ dontDisableStatic = true;
+
+ preBuild = ''
+ (cd lib-src ; make portaudio-v19/lib/libportaudio.a ; ln -sf
portaudio-v19/lib/.libs/libportaudio.a portaudio-v19/lib/libportaudio.a)
+ '';
meta = {
description = "Sound editor with graphical UI";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jan 2 16:35:14
2011 (r25339)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jan 2 17:13:34
2011 (r25340)
@@ -3889,6 +3889,7 @@
popt = callPackage ../development/libraries/popt { };
portaudio = callPackage ../development/libraries/portaudio { };
+ portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix {
};
proj = callPackage ../development/libraries/proj { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
