diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 96cb8b08e1cc..3ec79049bd14 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -5,9 +5,9 @@ nvidia_x11: sha256: lib, fetchFromGitHub, m4, - glibc, - libtirpc, pkg-config, + addDriverRunpath, + libtirpc, }: stdenv.mkDerivation { @@ -21,23 +21,22 @@ stdenv.mkDerivation { inherit sha256; }; - env = { - LIBRARY_PATH = "${glibc}/lib"; + env = lib.optionalAttrs (lib.versionOlder nvidia_x11.persistencedVersion "450.51") { NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = toString [ "-ltirpc" ]; }; - NIX_LDFLAGS = [ "-ltirpc" ]; nativeBuildInputs = [ m4 pkg-config + addDriverRunpath ]; buildInputs = [ libtirpc - stdenv.cc.cc.lib ]; - makeFlags = nvidia_x11.passthru.mod.makeFlags ++ [ "DATE=true" ]; + makeFlags = [ "DATE=true" ]; installFlags = [ "PREFIX=$(out)" ]; @@ -47,8 +46,7 @@ stdenv.mkDerivation { cp $out/{bin,origBin}/nvidia-persistenced patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 $out/origBin/nvidia-persistenced - patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-persistenced):${nvidia_x11}/lib" \ - $out/bin/nvidia-persistenced + addDriverRunpath $out/bin/nvidia-persistenced ''; meta = {