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.

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

yocto: Fix deprecation warnings #89

Merged
merged 1 commit into from
Jan 8, 2025
Merged

yocto: Fix deprecation warnings #89

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
8 changes: 4 additions & 4 deletions envs/yocto/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}:

let
fhs = pkgs.buildFHSUserEnvBubblewrap {
fhs = pkgs.buildFHSEnvBubblewrap {
name = "yocto-fhs";
targetPkgs = pkgs: with pkgs; let
ncurses' = pkgs.ncurses5.overrideAttrs
Expand Down Expand Up @@ -40,7 +40,7 @@ let
lz4'
# https://github.com/NixOS/nixpkgs/issues/218534
# postFixup would create symlinks for the non-unicode version but since it breaks
# in buildFHSUserEnv, we just install both variants
# in buildFHSEnv, we just install both variants
ncurses'
(ncurses'.override { unicodeSupport = false; })
patch
Expand Down Expand Up @@ -102,7 +102,7 @@ let
'';
in
''
# buildFHSUserEnvBubblewrap configures ld.so.conf while buildFHSUserEnv additionally sets the LD_LIBRARY_PATH.
# buildFHSEnvBubblewrap configures ld.so.conf while buildFHSEnv additionally sets the LD_LIBRARY_PATH.
# This is redundant, and incorrectly overrides the RPATH of yocto-built binaries causing the dynamic loader
# to load libraries from the host system that they were not built against, instead of those from yocto.
unset LD_LIBRARY_PATH
Expand All @@ -111,7 +111,7 @@ let
# ld-config causing unexpected libraries to be loaded when when the executable is run.
export NIX_DYNAMIC_LINKER_${pkgs.stdenv.cc.suffixSalt}="/lib/ld-linux-x86-64.so.2"

# These are set by buildFHSUserEnvBubblewrap
# These are set by buildFHSEnvBubblewrap
export BB_ENV_PASSTHROUGH_ADDITIONS="${lib.strings.concatStringsSep " " passthroughVars}"

# source the config for bibake equal to --postread
Expand Down
Loading