summary refs log tree commit diff
path: root/pkgs/os-specific/linux/opengl
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2007-05-15 20:00:30 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2007-05-15 20:00:30 +0000
commitd4f3016e100a95f983440d87efc680093f927e80 (patch)
treec6a32f9adc9bd273ae30d407efa6b25e5945bd03 /pkgs/os-specific/linux/opengl
parent2f670d1e0646f416796e3cbeb64f80505836315c (diff)
downloadnixpkgs-d4f3016e100a95f983440d87efc680093f927e80.tar
nixpkgs-d4f3016e100a95f983440d87efc680093f927e80.tar.gz
nixpkgs-d4f3016e100a95f983440d87efc680093f927e80.tar.bz2
nixpkgs-d4f3016e100a95f983440d87efc680093f927e80.tar.lz
nixpkgs-d4f3016e100a95f983440d87efc680093f927e80.tar.xz
nixpkgs-d4f3016e100a95f983440d87efc680093f927e80.tar.zst
nixpkgs-d4f3016e100a95f983440d87efc680093f927e80.zip
* Use a pure libdrm.
svn path=/nixpkgs/trunk/; revision=8704
Diffstat (limited to 'pkgs/os-specific/linux/opengl')
-rw-r--r--pkgs/os-specific/linux/opengl/xorg-sys/builder.sh2
-rw-r--r--pkgs/os-specific/linux/opengl/xorg-sys/default.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
index 2efe3113fbf..ef5126f1d9b 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 8248d9a327d..3bc1f73cfef 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];
 }