diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-05-15 20:00:30 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-05-15 20:00:30 +0000 |
commit | d4f3016e100a95f983440d87efc680093f927e80 (patch) | |
tree | c6a32f9adc9bd273ae30d407efa6b25e5945bd03 /pkgs/os-specific/linux/opengl | |
parent | 2f670d1e0646f416796e3cbeb64f80505836315c (diff) |
* 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.sh | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/opengl/xorg-sys/default.nix | 6 |
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 2efe3113fbf47..ef5126f1d9bf1 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 8248d9a327dee..3bc1f73cfef0b 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]; } |