diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:37:04 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:58:40 +0200 |
commit | e4832c754114c5660909546ac749475bf63ff06e (patch) | |
tree | fe77400566603caa218453ad5c7b6b9b5ea9715c /pkgs/development/libraries/xine-lib/default.nix | |
parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) | |
download | nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.gz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.bz2 nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.lz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.xz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.zst nixlib-e4832c754114c5660909546ac749475bf63ff06e.zip |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/development/libraries/xine-lib/default.nix')
-rw-r--r-- | pkgs/development/libraries/xine-lib/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 89b2d77db82a..3a37afc1cbec 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "xine-lib-1.2.4"; - + name = "xine-lib-1.2.6"; + src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1pdv7bs683ily548arv4wsxabslyf3x3laij5jb921dxyx71nnww"; + sha256 = "01d0nv4zhr4k8id5n4rmw13llrjsv9dhwg1a773c1iqpi1ris15x"; }; nativeBuildInputs = [ pkgconfig perl ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ]; - NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss"; - + NIX_LDFLAGS = "-lxcb-shm"; + propagatedBuildInputs = [zlib]; enableParallelBuilding = true; |