Author: mkwik
Date: Thu Apr 5 08:22:38 2012
New Revision: 33605
URL: https://nixos.org/websvn/nix/?rev=33605&sc=1
Log:
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.
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 Thu Apr 5
08:22:35 2012 (r33604)
+++ nixpkgs/trunk/pkgs/applications/audio/audacity/default.nix Thu Apr 5
08:22:38 2012 (r33605)
@@ -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;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 5 08:22:35
2012 (r33604)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Apr 5 08:22:38
2012 (r33605)
@@ -6329,10 +6329,7 @@
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;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
