Author: eelco
Date: Mon Dec 27 19:22:30 2010
New Revision: 25298
URL: https://svn.nixos.org/websvn/nix/?rev=25298&sc=1
Log:
* Put libvdpau_nvidia.so in a place where libvdpau can find it.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nvidia-x11/builder.sh
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nvidia-x11/builder.sh
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nvidia-x11/builder.sh
Mon Dec 27 18:48:16 2010 (r25297)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nvidia-x11/builder.sh
Mon Dec 27 19:22:30 2010 (r25298)
@@ -28,9 +28,7 @@
# 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 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
