diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-02-19 11:53:23 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-02-19 11:53:23 +0300 |
| commit | 362ef377c8e5314902c313fbc1d40efabd0c9406 (patch) | |
| tree | 83b99e74b3122cd46900222c86c7ba67b9f8c32e /pkgs/os-specific/linux/nvidia-x11 | |
| parent | b322271dd653b477fd400a269d6e7ba6c9afb91a (diff) | |
| download | nixlib-362ef377c8e5314902c313fbc1d40efabd0c9406.tar nixlib-362ef377c8e5314902c313fbc1d40efabd0c9406.tar.gz nixlib-362ef377c8e5314902c313fbc1d40efabd0c9406.tar.bz2 nixlib-362ef377c8e5314902c313fbc1d40efabd0c9406.tar.lz nixlib-362ef377c8e5314902c313fbc1d40efabd0c9406.tar.xz nixlib-362ef377c8e5314902c313fbc1d40efabd0c9406.tar.zst nixlib-362ef377c8e5314902c313fbc1d40efabd0c9406.zip | |
nvidia_x11.settings: link dlopen'ed libraries
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/settings.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index de60c9ccf4f1..d088fe5253c0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchurl, pkgconfig, m4, gtk2, gtk3, libXv, libvdpau +{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau , withGtk2 ? false, withGtk3 ? true }: @@ -15,8 +15,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig m4 ]; - buildInputs = [ gtk2 gtk3 libXv libvdpau ]; + buildInputs = [ jansson gtk2 gtk3 libXv libXrandr libvdpau nvidia_x11 ]; + NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ]; + + makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; installFlags = [ "PREFIX=$(out)" ]; preBuild = '' @@ -37,7 +40,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib:${nvidia_x11}/lib" \ + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib" \ $out/bin/nvidia-settings ''; |