mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Code Issues Wiki Activity

audacity: apply Arch patch to avoid vulnerable ffmpeg

Browse source 
Now it builds with the latest branch. /cc #12437.
This commit is contained in:
Vladimír Čunát 2016-01-17 10:24:06 +01:00
parent 83ff34d08c
commit 0b7e17e5a5
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/audio/audacity/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame,
libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch,
expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
}:
@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
sha256 = "15c5ff7ac1c0b19b08f4bdcb0f4988743da2f9ed3fab41d6f07600e67cb9ddb6";
};
patches = [(fetchpatch {
name = "new-ffmpeg.patch";
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
+ "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
})];
preConfigure = /* we prefer system-wide libs */ ''
mv lib-src lib-src-rm

4
pkgs/top-level/all-packages.nix
View file

@ -11099,9 +11099,7 @@ let
audacious = callPackage ../applications/audio/audacious { };
audacity = callPackage ../applications/audio/audacity {
ffmpeg = ffmpeg_2_2;
};
audacity = callPackage ../applications/audio/audacity { };
audio-recorder = callPackage ../applications/audio/audio-recorder { };