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

nvidia-settings: Make sure binary can find libXv.so

Browse Source
This commit is contained in:
Mateusz Kowalczyk 2017-12-17 15:34:32 +00:00
parent 8bcd948072
commit 34b0c1c417
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/nvidia-x11/settings.nix
View File

@ -41,12 +41,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig m4 ]; nativeBuildInputs = [ pkgconfig m4 ];
buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus ] buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus libXv ]
++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
# This next line makes the nvidia-settings binary fail to compile as of version 387.22
# NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ];
makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
@ -74,7 +71,7 @@ stdenv.mkDerivation rec {
binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings"; binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings";
postFixup = '' postFixup = ''
patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib" \ patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \
$out/bin/$binaryName $out/bin/$binaryName
''; '';