From 6f2e018c7abf49862ae9c49fdff51175dab5955d Mon Sep 17 00:00:00 2001 From: LluĂ­s Batlle i Rossell Date: Tue, 24 Nov 2009 14:01:48 +0000 Subject: Enabling plugins in avidemux. Adding an assertion, for stdenv having glibc. avidemux wants pthreads. svn path=/nixpkgs/trunk/; revision=18593 --- pkgs/applications/video/avidemux/default.nix | 24 ++++++++++++++++++++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 22 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 55c1e51712f5..c3e39aca8881 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,5 +1,8 @@ {stdenv, fetchurl, cmake, pkgconfig, libxml2, qt4, gtk, gettext, SDL, -libXv, pixman, libpthreadstubs, libXau, libXdmcp }: +libXv, pixman, libpthreadstubs, libXau, libXdmcp, libxslt, x264, +alsaLib, lame, faac, faad2, libvorbis }: + +assert stdenv ? glibc; stdenv.mkDerivation { name = "avidemux-2.5.1"; @@ -10,15 +13,28 @@ stdenv.mkDerivation { }; buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv - pixman libpthreadstubs libXau libXdmcp ]; + pixman libpthreadstubs libXau libXdmcp libxslt x264 alsaLib + lame faac faad2 libvorbis ]; - cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.gcc.libc}/include" + + cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" + " -DGETTEXT_INCLUDE_DIR=${gettext}/include" + " -DSDL_INCLUDE_DIR=${SDL}/include/SDL" + " -DCMAKE_SKIP_BUILD_RPATH=ON" + " -DCMAKE_BUILD_TYPE=Release"; - NIX_LDFLAGS="-lxml2 -lXv -lSDL -lQtGui -lQtCore"; + NIX_LDFLAGS="-lxml2 -lXv -lSDL -lQtGui -lQtCore -lpthread"; + + postInstall = '' + cd $NIX_BUILD_TOP/$sourceRoot + mkdir build_plugins + cd build_plugins + cmake $cmakeFlags -DAVIDEMUX_INSTALL_PREFIX=$out \ + -DAVIDEMUX_SOURCE_DIR=$NIX_BUILD_TOP/$sourceRoot \ + -DAVIDEMUX_CORECONFIG_DIR=$NIX_BUILD_TOP/$sourceRoot/build/config ../plugins + + make + make install + ''; meta = { homepage = http://fixounet.free.fr/avidemux/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a94544b619a8..a4497e1200b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6204,7 +6204,8 @@ let }; avidemux = import ../applications/video/avidemux { - inherit fetchurl stdenv cmake pkgconfig libxml2 qt4 gettext SDL; + inherit fetchurl stdenv cmake pkgconfig libxml2 qt4 gettext SDL libxslt x264 + alsaLib lame faac faad2 libvorbis; inherit (gtkLibs) gtk; inherit (xlibs) libXv pixman libpthreadstubs libXau libXdmcp; }; -- cgit 1.4.1