nvidia-settings: add libraries to runpath (#318131)
* Add runtime dependencies to nvidia-settings runpath. * Move libXv to runtimeDependencies nvidia-x11 settings.
This commit is contained in:
@@ -17,6 +17,7 @@ nvidia_x11: sha256:
|
||||
, libXxf86vm
|
||||
, libvdpau
|
||||
, librsvg
|
||||
, libglvnd
|
||||
, wrapGAppsHook3
|
||||
, addDriverRunpath
|
||||
, withGtk2 ? false
|
||||
@@ -77,6 +78,12 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
runtimeDependencies = [
|
||||
libglvnd libXrandr libXv
|
||||
];
|
||||
|
||||
runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -143,7 +150,7 @@ stdenv.mkDerivation {
|
||||
|
||||
binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings";
|
||||
postFixup = ''
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${runtimeLibraryPath}" \
|
||||
$out/bin/$binaryName
|
||||
|
||||
addDriverRunpath $out/bin/$binaryName
|
||||
|
||||
Reference in New Issue
Block a user