diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
new file mode 100644
index 000000000000..9b2eb19bab4d
--- /dev/null
+++ b/pkgs/development/libraries/libva/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, intelgen4asm }:
+
+stdenv.mkDerivation rec {
+  name = "libva-1.0.12";
+  
+  src = fetchurl {
+    url = "http://cgit.freedesktop.org/libva/snapshot/${name}.tar.bz2";
+    sha256 = "1xg8zvmh75w63sc8ykagzrbzswph6g9jardy8v83glkqzilaw2p8";
+  };
+
+  buildInputs = [ autoconf automake libtool libX11 libXext pkgconfig mesa libdrm
+    libXfixes intelgen4asm ];
+
+  configureFlags = [ "--enable-i965-driver" "--enable-glx" ];
+
+  preConfigure = "sh autogen.sh";
+
+  meta = {
+    homepage = http://www.freedesktop.org/wiki/Software/vaapi;
+    license = "MIT";
+    description = "VAAPI library: Video Acceleration API";
+  };
+}
diff --git a/pkgs/development/misc/intelgen4asm/default.nix b/pkgs/development/misc/intelgen4asm/default.nix
new file mode 100644
index 000000000000..d0e2517cdd9e
--- /dev/null
+++ b/pkgs/development/misc/intelgen4asm/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, autoconf, automake, libtool, bison, flex }:
+
+stdenv.mkDerivation rec {
+  name = "intel-g4asm-20110416";
+  
+  src = fetchgit {
+    url = http://anongit.freedesktop.org/git/xorg/app/intel-gen4asm.git;
+    rev = "2450ff752642d116eb789a35393b9828133c7d31";
+    sha256 = "a24c054a7c5ae335b72523fd2f51cae7f07a2885ef3c7a04d07a85e39f0c053f";
+  };
+
+  buildInputs = [ autoconf automake libtool bison flex ];
+
+  preConfigure = "sh autogen.sh";
+
+  meta = {
+    homepage = http://cgit.freedesktop.org/xorg/app/intel-gen4asm/;
+    license = "MIT";
+    description = "Program to compile an assembly language for the Intel 965 Express Chipset";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3223dbc14091..0ac77a402d3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2667,6 +2667,8 @@ let
 
   inotifyTools = callPackage ../development/tools/misc/inotify-tools { };
 
+  intelgen4asm = callPackage ../development/misc/intelgen4asm { };
+
   ired = callPackage ../development/tools/analysis/radare/ired.nix { };
 
   jam = callPackage ../development/tools/build-managers/jam { };
@@ -3779,6 +3781,8 @@ let
 
   libv4l = callPackage ../development/libraries/libv4l { };
 
+  libva = callPackage ../development/libraries/libva { };
+
   libvdpau = callPackage ../development/libraries/libvdpau { };
 
   libvirt = callPackage ../development/libraries/libvirt { };