diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2017-12-17 15:34:32 +0000 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2017-12-17 15:34:51 +0000 |
| commit | 34b0c1c4174bd061143db1467cd92d3bd72b1fd5 (patch) | |
| tree | 16544a00024e497ab3c357b6feee2b2c5676af92 /pkgs/os-specific/linux/nvidia-x11 | |
| parent | 8bcd948072f7cb07d14516813e74a5256e4b9408 (diff) | |
| download | nixlib-34b0c1c4174bd061143db1467cd92d3bd72b1fd5.tar nixlib-34b0c1c4174bd061143db1467cd92d3bd72b1fd5.tar.gz nixlib-34b0c1c4174bd061143db1467cd92d3bd72b1fd5.tar.bz2 nixlib-34b0c1c4174bd061143db1467cd92d3bd72b1fd5.tar.lz nixlib-34b0c1c4174bd061143db1467cd92d3bd72b1fd5.tar.xz nixlib-34b0c1c4174bd061143db1467cd92d3bd72b1fd5.tar.zst nixlib-34b0c1c4174bd061143db1467cd92d3bd72b1fd5.zip | |
nvidia-settings: Make sure binary can find libXv.so
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -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 ''; |