diff options
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11/settings.nix')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/settings.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index acdc44c702f3..bbe3af5d0169 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -41,12 +41,9 @@ stdenv.mkDerivation rec { 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 ]; -# 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" ]; installFlags = [ "PREFIX=$(out)" ]; @@ -74,7 +71,7 @@ stdenv.mkDerivation rec { binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings"; 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 ''; |