diff options
author | Nick Cao <nickcao@nichi.co> | 2023-08-14 18:43:48 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-14 18:43:48 -0600 |
commit | 467e4c2e93125bf686aba67b04e53baaf3fd6cd8 (patch) | |
tree | 603dd4c437e29331121e266855e868e7068aec8c /pkgs/os-specific/linux/nvidia-x11/settings.nix | |
parent | 1a1374a63b6ee56e86e8f772c7d21dc6e9d355cc (diff) | |
parent | 2249c1e5dc72467dda4339a5d92759b6e94eba22 (diff) | |
download | nixpkgs-467e4c2e93125bf686aba67b04e53baaf3fd6cd8.tar nixpkgs-467e4c2e93125bf686aba67b04e53baaf3fd6cd8.tar.gz nixpkgs-467e4c2e93125bf686aba67b04e53baaf3fd6cd8.tar.bz2 nixpkgs-467e4c2e93125bf686aba67b04e53baaf3fd6cd8.tar.lz nixpkgs-467e4c2e93125bf686aba67b04e53baaf3fd6cd8.tar.xz nixpkgs-467e4c2e93125bf686aba67b04e53baaf3fd6cd8.tar.zst nixpkgs-467e4c2e93125bf686aba67b04e53baaf3fd6cd8.zip |
Merge pull request #249158 from Kiskae/nvidia-settings/fix-path
linuxPackages.nvidia_x11.settings: fix runpath
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11/settings.nix')
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/settings.nix | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 6112b65eabd..0b801d4b272 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -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 @@ -75,10 +91,10 @@ 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 ]; + ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; installFlags = [ "PREFIX=$(out)" ]; @@ -106,6 +122,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 = { |