diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-01-25 02:54:08 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-01-26 04:30:26 +0300 |
| commit | 6563fa612562a6441794dddf774a001947247ab8 (patch) | |
| tree | 864decb3e89e7b0705806bea14e65f1de516ad12 /pkgs/os-specific | |
| parent | 364f297bb2d16236de01ef2175f99803665dc4a6 (diff) | |
| download | nixlib-6563fa612562a6441794dddf774a001947247ab8.tar nixlib-6563fa612562a6441794dddf774a001947247ab8.tar.gz nixlib-6563fa612562a6441794dddf774a001947247ab8.tar.bz2 nixlib-6563fa612562a6441794dddf774a001947247ab8.tar.lz nixlib-6563fa612562a6441794dddf774a001947247ab8.tar.xz nixlib-6563fa612562a6441794dddf774a001947247ab8.tar.zst nixlib-6563fa612562a6441794dddf774a001947247ab8.zip | |
nvidia_x11: move vdpau libraries to lib/vdpau
Diffstat (limited to 'pkgs/os-specific')
| -rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh | 4 | ||||
| -rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh | 6 | ||||
| -rwxr-xr-x | 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 } |