From 9d617d90d0a16d70ef46b67d0e3312f75f4f220d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Dec 2010 19:22:30 +0000 Subject: [PATCH] * Put libvdpau_nvidia.so in a place where libvdpau can find it. svn path=/nixpkgs/branches/stdenv-updates/; revision=25298 --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index bad0d8aabd20..830745ea6b71 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -28,9 +28,7 @@ installPhase() { # Install libGL and friends. ensureDir $out/lib - cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libvdpau.* libXv* tls $out/lib/ - ensureDir $out/lib/vdpau - cp -p libvdpau_* $out/lib/vdpau + cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libXv* libvdpau_nvidia* tls $out/lib/ ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so.1 @@ -41,9 +39,11 @@ installPhase() { ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1 ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1 ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1 + ln -snf libvdpau_nvidia.so.$versionNumber $out/lib/libvdpau_nvidia.so patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.* + patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* if test -z "$libsOnly"; then