diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
new file mode 100644
index 000000000000..07d63c66b781
--- /dev/null
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, mesa_noglu, libX11, libXext, glproto }:
+
+# Git version is needed for EGL and GLES handling.
+
+stdenv.mkDerivation rec {
+  name = "libglvnd-2016-12-22";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "libglvnd";
+    rev = "dc16f8c337703ad141f83583a4004fcf42e07766";
+    sha256 = "1dbwf1216np77xf1kx3ci3y7hfa1p4vgrrzg71gw36hqxf36vg5f";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig python2 ];
+  buildInputs = [ libX11 libXext glproto ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS"
+    "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${mesa_noglu.driverLink}/share/glvnd/egl_vendor.d\""
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  meta = with stdenv.lib; {
+    description = "The GL Vendor-Neutral Dispatch library";
+    homepage = "https://github.com/NVIDIA/libglvnd";
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47535f0ac0a5..c489085161f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8062,6 +8062,8 @@ with pkgs;
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
   libgnome_keyring3 = gnome3.libgnome_keyring;
 
+  libglvnd = callPackage ../development/libraries/libglvnd { };
+
   libgnurl = callPackage ../development/libraries/libgnurl { };
 
   libgringotts = callPackage ../development/libraries/libgringotts { };