diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 3c6d42ffc732..a6ce153b558e 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,11 +1,14 @@ {stdenv, fetchurl, x11, xineLib, libpng}: stdenv.mkDerivation { - name = "xine-ui-0.99.3"; + name = "xine-ui-0.99.4"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/xine-ui-0.99.3.tar.gz; - md5 = "aa7805a93e511e3d67dc1bf09a71fcdd"; + url = http://surfnet.dl.sourceforge.net/sourceforge/xine/xine-ui-0.99.4.tar.gz; + md5 = "90ea1f76747e9788a30a73e7f4a76cf6"; }; - buildInputs = [x11 xineLib libpng]; + buildInputs = [ + x11 xineLib libpng + (if xineLib.xineramaSupport then xineLib.libXinerama else null) + ]; configureFlags = "--without-readline"; } diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 1a930d623465..9ea675dbc716 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -11,12 +11,12 @@ assert xineramaSupport -> libXinerama != null; assert encryptedDVDSupport -> libdvdcss != null; assert alsaSupport -> alsaLib != null; -stdenv.mkDerivation { - name = "xine-lib-1.0.1"; +(stdenv.mkDerivation { + name = "xine-lib-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.0.1.tar.gz; - md5 = "9be804b337c6c3a2e202c5a7237cb0f8"; + url = http://surfnet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.1.0.tar.gz; + md5 = "3537cfd58d253b4be20a4975e7086e38"; }; buildInputs = [ x11 @@ -27,4 +27,4 @@ stdenv.mkDerivation { libXv = if xvideoSupport then libXv else null; libdvdcss = if encryptedDVDSupport then libdvdcss else null; propagatedBuildInputs = [zlib]; -} +}) // {inherit xineramaSupport libXinerama;}