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

nvidia_x11: reintroduce libXv for nvidia-settings

Browse Source 
It was dropped in 77986803a6.
This commit is contained in:
Vladimír Čunát 2015-02-21 17:25:43 +01:00
parent 382f175f10
commit 7bf2021349
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@ -75,7 +75,7 @@ installPhase() {
for i in nvidia-settings nvidia-smi; do for i in nvidia-settings nvidia-smi; do
cp $i $out/bin/$i cp $i $out/bin/$i
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $out/lib:$glPath $out/bin/$i --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
done done
patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.* patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.*

1
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -49,6 +49,7 @@ stdenv.mkDerivation {
# we don't support the gtk2 version # we don't support the gtk2 version
gtk3Path = optionalString (!libsOnly) (makeLibraryPath gtk3Path = optionalString (!libsOnly) (makeLibraryPath
[ gtk3 atk pango glib gdk_pixbuf cairo ] ); [ gtk3 atk pango glib gdk_pixbuf cairo ] );
programPath = makeLibraryPath [ xlibs.libXv ];
buildInputs = [ perl ]; buildInputs = [ perl ];