public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Use a pure libdrm.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8704
This commit is contained in:
Eelco Dolstra 2007-05-15 20:00:30 +00:00
parent 2f670d1e06
commit d4f3016e10
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
View File

@ -5,7 +5,7 @@ ensureDir $out/lib
ln -s /usr/lib/libGL.so.1 $out/lib/ ln -s /usr/lib/libGL.so.1 $out/lib/
ln -s /usr/lib/libGLcore.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/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 for i in $neededLibs; do
ln -s $i/lib/*.so* $out/lib/ ln -s $i/lib/*.so* $out/lib/

6
pkgs/os-specific/linux/opengl/xorg-sys/default.nix
View File

@ -6,10 +6,10 @@
# Of course, use of the driver in /usr/lib is highly impure. But it # Of course, use of the driver in /usr/lib is highly impure. But it
# might actually work ;-) # might actually work ;-)
{stdenv, xlibs, expat}: {stdenv, xlibs, expat, libdrm}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xorg-sys-opengl"; name = "xorg-sys-opengl-2";
builder = ./builder.sh; builder = ./builder.sh;
neededLibs = [xlibs.libXxf86vm xlibs.libXext expat]; neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm];
} }

2
pkgs/top-level/all-packages.nix
View File

@ -2451,7 +2451,7 @@ rec {
}; };
xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys { xorg_sys_opengl = import ../os-specific/linux/opengl/xorg-sys {
inherit stdenv xlibs expat; inherit stdenv xlibs expat libdrm;
}; };