Skip to content

Commit

Permalink
Add makedeps to chroot
Browse files Browse the repository at this point in the history
Fixes #1202
  • Loading branch information
Morganamilo committed Nov 16, 2024
1 parent 6af6674 commit 2f5e6e1
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions src/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ impl Installer {
chroot_flags.push("-cu");
self.chroot
.build(dir, &extra, &chroot_flags, &["-ofA"], &config.env)
.with_context(|| tr!("failed to download sources for '{}'"))?;
.with_context(|| tr!("failed to download sources for '{}'", base))?;

if !self.chroot.extra_pkgs.is_empty() {
let mut pkgs = vec!["pacman", "-S", "--asdeps", "--needed", "--noconfirm", "--"];
Expand Down Expand Up @@ -617,18 +617,8 @@ impl Installer {
debug_paths: &HashMap<String, String>,
) {
let to_install: Vec<_> = match base {
Base::Aur(a) => a
.pkgs
.iter()
.filter(|a| !a.make)
.map(|a| a.pkg.name.as_str())
.collect(),
Base::Pkgbuild(c) => c
.pkgs
.iter()
.filter(|c| !c.make)
.map(|a| a.pkg.pkgname.as_str())
.collect(),
Base::Aur(a) => a.pkgs.iter().map(|a| a.pkg.name.as_str()).collect(),
Base::Pkgbuild(c) => c.pkgs.iter().map(|a| a.pkg.pkgname.as_str()).collect(),
};

let to_install = to_install
Expand Down

0 comments on commit 2f5e6e1

Please sign in to comment.