diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh index 6acf49a52e88..3119b7893011 100644 --- a/pkgs/applications/video/mythtv/builder.sh +++ b/pkgs/applications/video/mythtv/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup # Hack - MythTV's configure searches LD_LIBRARY_PATH for its # dependencies. -for i in $buildInputs; do +for i in $pkgs; do export LD_LIBRARY_PATH=$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$i/lib done echo $LD_LIBRARY_PATH diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 02c637dd842f..6ca6651c5717 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, qt3, x11, xlibs -, lame, zlib, mesa +, lame, zlib, mesa, alsaLib , freetype, perl }: @@ -22,8 +22,9 @@ stdenv.mkDerivation { ''; buildInputs = [ - freetype qt3 lame zlib x11 mesa perl - xlibs.libXv xlibs.libXrandr xlibs.libXvMC xlibs.libXmu + freetype qt3 lame zlib x11 mesa perl alsaLib + xlibs.libX11 xlibs.libXv xlibs.libXrandr xlibs.libXvMC xlibs.libXmu + xlibs.libXinerama xlibs.libXxf86vm xlibs.libXmu ]; patches = [ diff --git a/pkgs/tools/misc/xmltv/default.nix b/pkgs/tools/misc/xmltv/default.nix index 206f92048b58..6a27bf4d0687 100644 --- a/pkgs/tools/misc/xmltv/default.nix +++ b/pkgs/tools/misc/xmltv/default.nix @@ -4,10 +4,10 @@ }: import ../../../development/perl-modules/generic perl { - name = "xmltv-0.5.45"; + name = "xmltv-0.5.51"; src = fetchurl { - url = mirror://sourceforge/xmltv/xmltv-0.5.45.tar.bz2; - sha256 = "0w6yy4r41c0pr1yvz017dkqj3526jiq9gza0jzw8ygk04jdh6ji3"; + url = mirror://sourceforge/xmltv/xmltv-0.5.51.tar.bz2; + sha256 = "0vgc167y6y847m18vg3qwjy3df12bryjy9par01n5b9mjalx9jpd"; }; makeMakerFlags = "-components tv_grab_nl"; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f17be5a11820..9423ebd81678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6128,7 +6128,7 @@ let pkgs = rec { }; mythtv = import ../applications/video/mythtv { - inherit fetchurl stdenv which x11 xlibs lame zlib mesa freetype perl; + inherit fetchurl stdenv which x11 xlibs lame zlib mesa freetype perl alsaLib; qt3 = qt3mysql; };