* Use a pure libdrm.
svn path=/nixpkgs/trunk/; revision=8704
This commit is contained in:
parent
2f670d1e06
commit
d4f3016e10
|
@ -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/
|
||||
|
|
|
@ -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];
|
||||
}
|
||||
|
|
|
@ -2451,7 +2451,7 @@ rec {
|
|||
};
|
||||
|
||||
xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys {
|
||||
inherit stdenv xlibs expat;
|
||||
inherit stdenv xlibs expat libdrm;
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue