From d4f3016e100a95f983440d87efc680093f927e80 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 May 2007 20:00:30 +0000
Subject: [PATCH] * Use a pure libdrm.

svn path=/nixpkgs/trunk/; revision=8704
---
 pkgs/os-specific/linux/opengl/xorg-sys/builder.sh  | 2 +-
 pkgs/os-specific/linux/opengl/xorg-sys/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
index 2efe3113fbf4..ef5126f1d9bf 100644
--- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
+++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
@@ -5,7 +5,7 @@ ensureDir $out/lib
 ln -s /usr/lib/libGL.so.1 $out/lib/
 ln -s /usr/lib/libGLcore.so.1 $out/lib/
 ln -s /usr/lib/libnvidia-tls.so.1 $out/lib/
-ln -s /usr/lib/libdrm.so.2 $out/lib/
+#ln -s /usr/lib/libdrm.so.2 $out/lib/
 
 for i in $neededLibs; do
     ln -s $i/lib/*.so* $out/lib/
diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix
index 8248d9a327de..3bc1f73cfef0 100644
--- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix
+++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix
@@ -6,10 +6,10 @@
 # Of course, use of the driver in /usr/lib is highly impure.  But it
 # might actually work ;-)
 
-{stdenv, xlibs, expat}:
+{stdenv, xlibs, expat, libdrm}:
 
 stdenv.mkDerivation {
-  name = "xorg-sys-opengl";
+  name = "xorg-sys-opengl-2";
   builder = ./builder.sh;
-  neededLibs = [xlibs.libXxf86vm xlibs.libXext expat];
+  neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4244871ddeae..30480c02cab7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2451,7 +2451,7 @@ rec {
   };
 
   xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys {
-    inherit stdenv xlibs expat;
+    inherit stdenv xlibs expat libdrm;
   };