Skip to content

fix: cherry-pick upstream fix for bootOrder -> initialBootOrder usage #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mic92 wants to merge 1 commit into
base: march-rebase
Choose a base branch
from
Open

fix: cherry-pick upstream fix for bootOrder -> initialBootOrder usage #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions pkgs/cuda-packages-11-4/nsight_compute_host.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
, dbus
, expat
, fontconfig
, libice
, libsm
, libxcb
, libxcomposite
, libxdamage
, libxfixes
, libxtst
, ncurses5
, noto-fonts
, nsight_compute_target
Expand All @@ -12,7 +19,6 @@
, qt6
, stdenv
, xkeyboard_config
, xorg
,
}:
let
Expand Down Expand Up @@ -65,18 +71,18 @@ buildFHSEnv {
(
[
ncurses5
xorg.libxcb
libxcb
fontconfig
noto-fonts
dbus
nss
xorg.libXcomposite
xorg.libXdamage
libxcomposite
libxdamage
alsa-lib
xorg.libXtst
xorg.libSM
xorg.libICE
xorg.libXfixes
libxtst
libsm
libice
libxfixes
xkeyboard_config
expat
nspr
Expand Down
22 changes: 14 additions & 8 deletions pkgs/cuda-packages-11-4/nsight_systems_host.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
, dbus
, expat
, fontconfig
, libice
, libsm
, libxcb
, libxcomposite
, libxdamage
, libxfixes
, libxtst
, ncurses5
, noto-fonts
, nsight_systems_target
Expand All @@ -14,7 +21,6 @@
, requireFile
, stdenv
, xkeyboard_config
, xorg
,
}:
let
Expand Down Expand Up @@ -86,18 +92,18 @@ buildFHSEnv {
(
[
ncurses5
xorg.libxcb
libxcb
fontconfig
noto-fonts
dbus
nss
xorg.libXcomposite
xorg.libXdamage
libxcomposite
libxdamage
alsa-lib
xorg.libXtst
xorg.libSM
xorg.libICE
xorg.libXfixes
libxtst
libsm
libice
libxfixes
xkeyboard_config
expat
nspr
Expand Down
9 changes: 5 additions & 4 deletions pkgs/l4t/driverDebs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
, debs
, lib
, libgcc
, xorg
, libx11
, libxext
}:
let
findDriverDebNames = majorVersion: lib.filter (lib.hasSuffix "-${majorVersion}") (lib.attrNames debs.common);
Expand All @@ -14,10 +15,10 @@ let

buildInputs = lib.attrByPath [ pname ] [ ] {
libnvidia-compute-580 = [ driverDebs.libnvidia-decode-580 libgcc ];
libnvidia-decode-580 = [ xorg.libX11 xorg.libXext ];
libnvidia-decode-580 = [ libx11 libxext ];
libnvidia-encode-580 = [ driverDebs.libnvidia-decode-580 ];
libnvidia-fbc1-580 = [ xorg.libX11 xorg.libXext ];
libnvidia-gl-580 = [ xorg.libX11 xorg.libXext libgcc driverDebs.libnvidia-gpucomp-580 ];
libnvidia-fbc1-580 = [ libx11 libxext ];
libnvidia-gl-580 = [ libx11 libxext libgcc driverDebs.libnvidia-gpucomp-580 ];
};
});
in
Expand Down
6 changes: 4 additions & 2 deletions pkgs/l4t/l4t-3d-core.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
, l4t-core
, lib
, libglvnd
, xorg
, libx11
, libxcb
, libxext
,
}:
# TODO: Split this package up into subpackages similar to what is done in meta-tegra: vulkan, glx, egl, etc
Expand Down Expand Up @@ -60,5 +62,5 @@ buildFromDebs {
rm -r share/doc
'';

appendRunpaths = [ "${placeholder "out"}/lib" ] ++ builtins.map (p: (lib.getLib p) + "/lib") [ libglvnd xorg.libX11 xorg.libXext xorg.libxcb ];
appendRunpaths = [ "${placeholder "out"}/lib" ] ++ builtins.map (p: (lib.getLib p) + "/lib") [ libglvnd libx11 libxext libxcb ];
}
7 changes: 3 additions & 4 deletions pkgs/samples/graphics-demos.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@
, libxkbcommon
, stdenv
, wayland
, xorg
, libx11
, libxau
, l4tAtLeast
}:
# TODO: Add wayland and x11 tests for graphics demos....
let
inherit (xorg) libX11 libXau;

repo = if l4tAtLeast "38" then "som" else "t234";
in
stdenv.mkDerivation {
Expand All @@ -25,7 +24,7 @@ stdenv.mkDerivation {
sourceRoot = "source/usr/src/nvidia/graphics_demos";

nativeBuildInputs = [ dpkg ];
buildInputs = [ libX11 libGL libXau libdrm wayland libxkbcommon libffi ];
buildInputs = [ libx11 libGL libxau libdrm wayland libxkbcommon libffi ];

postPatch = ''
substituteInPlace Makefile.l4tsdkdefs \
Expand Down
5 changes: 2 additions & 3 deletions pkgs/samples/multimedia-samples.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
, python3
, vulkan-headers
, vulkan-loader
, xorg
, libx11
}:
# https://docs.nvidia.com/jetson/l4t-multimedia/group__l4t__mm__test__group.html
let
Expand All @@ -30,7 +30,6 @@ let
cudatoolkit
tensorrt
;
inherit (xorg) libX11;
in
backendStdenv.mkDerivation {
__structuredAttrs = true;
Expand All @@ -51,7 +50,7 @@ backendStdenv.mkDerivation {
l4t-multimedia
libdrm
libglvnd
libX11
libx11
opencv
pango
tensorrt
Expand Down