linuxPackage.nvidia_x11.settings: nixpkgs-fmt and add opengl runpath
This commit is contained in:
parent
877980c410
commit
2249c1e5dc
@ -1,9 +1,25 @@
|
||||
nvidia_x11: sha256:
|
||||
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, m4, jansson, gtk2, dbus, gtk3
|
||||
, libXv, libXrandr, libXext, libXxf86vm, libvdpau
|
||||
, librsvg, wrapGAppsHook
|
||||
, withGtk2 ? false, withGtk3 ? true
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, m4
|
||||
, jansson
|
||||
, gtk2
|
||||
, dbus
|
||||
, gtk3
|
||||
, libXv
|
||||
, libXrandr
|
||||
, libXext
|
||||
, libXxf86vm
|
||||
, libvdpau
|
||||
, librsvg
|
||||
, wrapGAppsHook
|
||||
, addOpenGLRunpath
|
||||
, withGtk2 ? false
|
||||
, withGtk3 ? true
|
||||
}:
|
||||
|
||||
let
|
||||
@ -69,7 +85,7 @@ stdenv.mkDerivation {
|
||||
fi
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config m4 ];
|
||||
nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ];
|
||||
|
||||
buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]
|
||||
++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
|
||||
@ -100,6 +116,8 @@ stdenv.mkDerivation {
|
||||
postFixup = ''
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \
|
||||
$out/bin/$binaryName
|
||||
|
||||
addOpenGLRunpath $out/bin/$binaryName
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
Loading…
Reference in New Issue
Block a user