From a38ba26fbe69fc2815139d30ecec7e39142c757e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 11 Mar 2012 14:07:19 +0000 Subject: [PATCH] cinelerra: drop esound support I'm going to remove esound from nixpkgs in a few minutes. svn path=/nixpkgs/trunk/; revision=32981 --- pkgs/applications/video/cinelerra/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 83736d039327..98ba7a8e137e 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, sourceFromHead, autoconf, automake, libtool , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg -, libtiff, freetype, mjpegtools, x264, gettext, openexr, esound +, libtiff, freetype, mjpegtools, x264, gettext, openexr , libXext, libXxf86vm, libXv, libXi, libX11, xextproto, libtheora, libpng , libdv, libuuid, file, nasm, perl }: @@ -33,7 +33,7 @@ stdenv.mkDerivation { faad2 faac a52dec alsaLib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype - mjpegtools x264 gettext openexr esound + mjpegtools x264 gettext openexr libXext libXxf86vm libXv libXi libX11 xextproto libtheora libpng libdv libuuid nasm diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e84717b6e543..e1647afe18b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6365,9 +6365,7 @@ let icon = "${chrome}/libexec/chrome/product_logo_48.png"; }; - cinelerra = callPackage ../applications/video/cinelerra { - inherit (gnome) esound; - }; + cinelerra = callPackage ../applications/video/cinelerra { }; cmus = callPackage ../applications/audio/cmus { };