Skip to content
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.

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

Fix driver #257

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions modules/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ in

hardware.deviceTree.enable = true;

hardware.opengl.package = pkgs.nvidia-jetpack.l4t-3d-core;
hardware.opengl.extraPackages =
hardware.graphics.package = pkgs.nvidia-jetpack.l4t-3d-core;
hardware.graphics.extraPackages =
with pkgs.nvidia-jetpack;
# l4t-core provides - among others - libnvrm_gpu.so and libnvrm_mem.so.
# The l4t-core/lib directory is directly set in the DT_RUNPATH of
Expand Down Expand Up @@ -364,6 +364,7 @@ in
};

# Used by libEGL_nvidia.so.0
environment.etc."egl/egl_external_platform.d".source = "${pkgs.addOpenGLRunpath.driverLink}/share/egl/egl_external_platform.d/";
environment.etc."egl/egl_external_platform.d".source =
"${pkgs.addDriverRunpath.driverLink}/share/egl/egl_external_platform.d/";
};
}
12 changes: 12 additions & 0 deletions modules/flash-script.nix
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,18 @@ in
default = [ ];
description = "A list of paths to compiled .dtbo files to include with the UEFI image while flashing. These overlays are applied by UEFI at runtime";
};

preFlashCommands = mkOption {
type = types.lines;
default = "";
description = "Additional commands to be added to the flash script while it is being constructed.";
};

postFlashCommands = mkOption {
type = types.lines;
default = "";
description = "Additional commands to be added to the flash script while it is being constructed.";
};
};

flashScript = mkOption {
Expand Down
2 changes: 1 addition & 1 deletion overlay-with-config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ final: prev: (
mkFlashScript = flash-tools: args: import ./device-pkgs/flash-script.nix ({
inherit lib flash-tools;
inherit (cfg.firmware) eksFile;
inherit (cfg.flashScriptOverrides) flashArgs partitionTemplate;
inherit (cfg.flashScriptOverrides) flashArgs partitionTemplate preFlashCommands postFlashCommands;
inherit (finalJetpack) tosImage socType uefi-firmware;

additionalDtbOverlays = args.additionalDtbOverlays or cfg.flashScriptOverrides.additionalDtbOverlays;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/l4t/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
{ stdenv
, stdenvNoCC
, buildPackages
, addOpenGLRunpath
, lib
, fetchurl
, fetchpatch
, fetchgit
, autoPatchelfHook
, dpkg
, expat
Expand Down