diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index adb8e170feb..e4a3874de41 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,36 +1,19 @@ -args: with args; - let localDefs = builderDefs.passthru.function { - src = - fetchurl { - url = mirror://sourceforge/audacity/audacity-src-1.3.3.tar.gz; - sha256 = "17bjc2rnqspg1mbay4b1hhgg08iadapwf6w98gbv3r84rv1mhgls"; - }; +{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib }: - buildInputs =[(wxGTK null) libogg libvorbis libsndfile libmad pkgconfig gtk - gettext glib]; - }; - in with localDefs; -let - postInstall = FullDepEntry (" - old_rpath=$(patchelf --print-rpath \$out/bin/audacity); - patchelf --set-rpath \$old_rpath:${gtk}/lib:${glib}/lib \$out/bin/audacity; - ") [minInit]; - preBuild = FullDepEntry (" - sed -e '/\\/usr\\/local\\/lib\\/ladspa/awxGetApp()."+ - "AddUniquePathToPathList(wxGetenv(wxT(\"HOME\"))+"+ - "wxT(\"/.ladspa-plugins\"), pathList);' - - ") [minInit]; -in stdenv.mkDerivation { - name = "audacity-1.3.3"; + name = "audacity-1.3.7"; - builder = writeScript "audacity-1.3.3-builder" - (textClosure localDefs [addInputs (doDump "0") (noDepEntry "echo \$PATH; ar --version") doConfigure preBuild doMakeInstall postInstall doForceShare]); + 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 = "1kashc6cc6d5g6i59nqcrl795x1jqdh0lpg3msa1wckfj3hpljmy"; + }; + buildInputs = [ wxGTK pkgconfig gettext gtk glib zlib ]; meta = { - description = "Audacity sound editor."; + description = "Sound editor with graphical UI"; homepage = http://audacity.sourceforge.net; - inherit src; + license = "GPLv2+"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1105bcc9b4..ff4742ba6e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7691,11 +7691,9 @@ let }; audacity = import ../applications/audio/audacity { - inherit fetchurl stdenv libogg libvorbis libsndfile libmad - pkgconfig gettext; + inherit fetchurl stdenv gettext pkgconfig zlib; inherit (gtkLibs) gtk glib; - wxGTK = wxGTK28deps; - inherit builderDefs stringsWithDeps; + wxGTK = wxGTK28; }; aumix = import ../applications/audio/aumix {