diff options
author | Lluís Batlle i Rossell <viric@viric.name> | 2013-01-29 11:56:12 +0100 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-01-29 18:37:06 +0100 |
commit | 675679f450ff1f1e6b11a011ac59e5ac6d50730d (patch) | |
tree | 22020d85bc01ddead3f932e23b2eb9ee868c00fd /pkgs/development/libraries | |
parent | 3f49d8dd5070776317e759d5f7a7497bf72533d0 (diff) | |
download | nixpkgs-675679f450ff1f1e6b11a011ac59e5ac6d50730d.tar nixpkgs-675679f450ff1f1e6b11a011ac59e5ac6d50730d.tar.gz nixpkgs-675679f450ff1f1e6b11a011ac59e5ac6d50730d.tar.bz2 nixpkgs-675679f450ff1f1e6b11a011ac59e5ac6d50730d.tar.lz nixpkgs-675679f450ff1f1e6b11a011ac59e5ac6d50730d.tar.xz nixpkgs-675679f450ff1f1e6b11a011ac59e5ac6d50730d.tar.zst nixpkgs-675679f450ff1f1e6b11a011ac59e5ac6d50730d.zip |
Fixes on VAAPI src packages.
The github 'snapshots' weren't stable on hashes, I think (at least as I saw today trying to build vaapiVdpau in another computer). Using released tarballs, pointer by vcunat.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/libva/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/vaapi-intel/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/vaapi-vdpau/default.nix | 11 |
3 files changed, 15 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index cf030eda777..5caea5ba610 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,21 +1,17 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa -, libdrm, libXfixes, intelgen4asm, which }: +{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { name = "libva-1.1.0"; src = fetchurl { - url = "http://cgit.freedesktop.org/libva/snapshot/${name}.tar.bz2"; - sha256 = "0lqkharln67p60jlyz9y662gjgqk2iy2nrj84j1jr1nzgw7j01a5"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + sha256 = "1a7g7i96ww8hmim2pq2a3xc89073lzacxn1xh9526bzhlqjdqsnv"; }; - buildInputs = [ autoconf automake libtool libX11 libXext pkgconfig mesa libdrm - libXfixes intelgen4asm which ]; + buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; configureFlags = [ "--enable-glx" ]; - preConfigure = "sh autogen.sh"; - meta = { homepage = http://www.freedesktop.org/wiki/Software/vaapi; license = "MIT"; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 432daa88a33..548aeb8a2de 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig +, intelgen4asm }: stdenv.mkDerivation rec { - name = "intel-driver-1.0.19"; + name = "libva-intel-driver-1.0.19"; src = fetchurl { - url = "http://cgit.freedesktop.org/intel-driver/snapshot/${name}.tar.bz2"; - sha256 = "1ns6y1hdqvqd92mc0d6axyh17rgyzp73xnbf97mnnzi9fc47x6p1"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; + sha256 = "14m7krah3ajkwj190q431lqqa84hdljcdmrcrqkbgaffyjlqvdid"; }; - buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 ]; + buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 intelgen4asm ]; preConfigure = '' sh autogen.sh diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 58ebc103275..a3d51217ead 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libvdpau, mesa, libva, pkgconfig }: +{ stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }: stdenv.mkDerivation rec { - name = "vdpau-driver-0.7.4"; + name = "libva-vdpau-driver-0.7.4"; src = fetchurl { - url = "http://cgit.freedesktop.org/vdpau-driver/snapshot/${name}.tar.bz2"; - sha256 = "1kvhpqwzw01bfamvxhnl4yhmb7pwkkfaii3w7bidd4vj1gsrx5l4"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; + sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; }; - buildInputs = [ autoconf automake libtool libvdpau mesa libva pkgconfig ]; + buildInputs = [ libvdpau mesa libva pkgconfig ]; preConfigure = '' - sh autogen.sh sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; |