mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-14 16:40:09 +03:00
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:
|
nvidia_x11: sha256:
|
||||||
|
|
||||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, m4, jansson, gtk2, dbus, gtk3
|
{ stdenv
|
||||||
, libXv, libXrandr, libXext, libXxf86vm, libvdpau
|
, lib
|
||||||
, librsvg, wrapGAppsHook
|
, fetchFromGitHub
|
||||||
, withGtk2 ? false, withGtk3 ? true
|
, fetchpatch
|
||||||
|
, pkg-config
|
||||||
|
, m4
|
||||||
|
, jansson
|
||||||
|
, gtk2
|
||||||
|
, dbus
|
||||||
|
, gtk3
|
||||||
|
, libXv
|
||||||
|
, libXrandr
|
||||||
|
, libXext
|
||||||
|
, libXxf86vm
|
||||||
|
, libvdpau
|
||||||
|
, librsvg
|
||||||
|
, wrapGAppsHook
|
||||||
|
, addOpenGLRunpath
|
||||||
|
, withGtk2 ? false
|
||||||
|
, withGtk3 ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -69,10 +85,10 @@ stdenv.mkDerivation {
|
|||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config m4 ];
|
nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ];
|
||||||
|
|
||||||
buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]
|
buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]
|
||||||
++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
|
++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
|
||||||
|
|
||||||
installFlags = [ "PREFIX=$(out)" ];
|
installFlags = [ "PREFIX=$(out)" ];
|
||||||
|
|
||||||
@ -100,6 +116,8 @@ stdenv.mkDerivation {
|
|||||||
postFixup = ''
|
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:${libXv}/lib" \
|
||||||
$out/bin/$binaryName
|
$out/bin/$binaryName
|
||||||
|
|
||||||
|
addOpenGLRunpath $out/bin/$binaryName
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
Loading…
Reference in New Issue
Block a user