From 6563fa612562a6441794dddf774a001947247ab8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 25 Jan 2016 02:54:08 +0300 Subject: nvidia_x11: move vdpau libraries to lib/vdpau --- pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh | 4 ++++ pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh | 6 +++++- pkgs/os-specific/linux/nvidia-x11/builder.sh | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh index 20666fdb061f..fe8267831410 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh @@ -93,6 +93,10 @@ installPhase() { substituteInPlace $out/share/applications/nvidia-settings.desktop \ --replace '__UTILS_PATH__' $out/bin \ --replace '__PIXMAP_PATH__' $out/share/pixmaps + + # Move VDPAU libraries to their place + mkdir "$out"/lib/vdpau + mv "$out"/lib/libvdpau* "$out"/lib/vdpau fi } diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh index d0eec0f7403b..899f12daf6b5 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh @@ -108,8 +108,12 @@ installPhase() { #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* - # we distribute these separately in `libvdpau` + # We distribute these separately in `libvdpau` rm "$out"/lib/libvdpau{.*,_trace.*} + + # Move VDPAU libraries to their place + mkdir "$out"/lib/vdpau + mv "$out"/lib/libvdpau* "$out"/lib/vdpau } diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 502648c1d513..c1f165c45dd5 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -119,8 +119,12 @@ installPhase() { # For simplicity and dependency reduction, don't support the gtk3 interface. rm $out/lib/libnvidia-gtk3.* - # we distribute these separately in `libvdpau` + # We distribute these separately in `libvdpau` rm "$out"/lib/libvdpau{.*,_trace.*} + + # Move VDPAU libraries to their place + mkdir "$out"/lib/vdpau + mv "$out"/lib/libvdpau* "$out"/lib/vdpau } -- cgit 1.4.1