From a6c996735c3fa1cbb3010966639fe9014f7ea824 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 5 Apr 2012 08:22:38 +0000
Subject: [PATCH] audacity: upgraded to 2.0.0

I took out some dependencies and compile flags that didn't seem
needed. If this breaks something please give a shout.

svn path=/nixpkgs/trunk/; revision=33605
---
 pkgs/applications/audio/audacity/default.nix | 16 +++++-----------
 pkgs/top-level/all-packages.nix              |  5 +----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index f2e2a130c0ac..72b58b5b33e5 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -4,21 +4,15 @@
   }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.13";
+  version = "2.0.0";
   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-minsrc-${version}-beta.tar.bz2";
-    sha256 = "4c2eda638e16e16dfddd202e86ccbe1d170b04c26cfb2c12ffcba0b79e7e1e83";
+    url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2";
+    sha256 = "0spbib3f86b4qri0g13idyxvysg28hkpsglmjza681zrln62hjfq";
   };
-  buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib intltool perl 
-    libogg libvorbis libmad alsaLib libsndfile libsamplerate flac lame
-    expat id3lib ffmpeg portaudio];
-
-  configureFlags = [
-  ];
+  buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate
+                  libvorbis libmad flac id3lib ffmpeg gettext ];
 
   dontDisableStatic = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e97db624e945..81f49bf27043 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6329,10 +6329,7 @@ let
 
   audacious = callPackage ../applications/audio/audacious { };
 
-  audacity = callPackage ../applications/audio/audacity {
-    portaudio = portaudioSVN;
-    ffmpeg = ffmpeg_0_6_90;
-  };
+  audacity = callPackage ../applications/audio/audacity { };
 
   aumix = callPackage ../applications/audio/aumix {
     gtkGUI = false;