From ee25a707f83dce0afbc856e067dd65a80a4501a5 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 3 Sep 2025 18:22:41 +0200
Subject: [PATCH] Remove pkg_deps binary

---
 repo.sh                 |  7 -------
 src/bin/pkg_deps.rs     | 22 ----------------------
 src/bin/repo_builder.rs | 17 +++++++++++++++--
 3 files changed, 15 insertions(+), 31 deletions(-)
 delete mode 100644 src/bin/pkg_deps.rs

diff --git a/repo.sh b/repo.sh
index 5fc214215..f24580057 100755
--- a/repo.sh
+++ b/repo.sh
@@ -31,11 +31,4 @@ target/release/cook $COOK_OPT $recipes
 repo="$ROOT/repo/$TARGET"
 mkdir -p "$repo"
 
-# Runtime dependencies include both `[package.dependencies]` and dynamically
-# linked packages discovered by auto_deps.
-#
-# The following adds the package dependencies of the recipes to the repo as
-# well.
-recipes="$recipes $(target/release/pkg_deps $recipes)"
-
 target/release/repo_builder "$repo" $recipes
diff --git a/src/bin/pkg_deps.rs b/src/bin/pkg_deps.rs
deleted file mode 100644
index 4fddb79d9..000000000
--- a/src/bin/pkg_deps.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use std::env::args;
-
-use pkg::{
-    package::{Package, PackageError},
-    PackageName,
-};
-
-use cookbook::WALK_DEPTH;
-
-fn main() -> Result<(), PackageError> {
-    let names: Vec<PackageName> = args()
-        .skip(1)
-        .map(PackageName::new)
-        .collect::<Result<_, _>>()?;
-
-    let packages = Package::new_recursive(&names, WALK_DEPTH)?;
-    for package in packages {
-        println!("{}", package.name);
-    }
-
-    Ok(())
-}
diff --git a/src/bin/repo_builder.rs b/src/bin/repo_builder.rs
index 4af35624c..d903bfd13 100644
--- a/src/bin/repo_builder.rs
+++ b/src/bin/repo_builder.rs
@@ -1,4 +1,5 @@
-use pkg::recipes;
+use cookbook::WALK_DEPTH;
+use pkg::{recipes, Package, PackageName};
 use std::collections::{BTreeMap, HashMap};
 use std::env;
 use std::fs::{self, File};
@@ -24,9 +25,21 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let repo_dir = args
         .next()
         .expect("Usage: repo_builder <REPO_DIR> <recipe1> <recipe2> ...");
-    let recipe_list: Vec<String> = args.collect();
     let repo_path = Path::new(&repo_dir);
 
+    // Runtime dependencies include both `[package.dependencies]` and dynamically
+    // linked packages discovered by auto_deps.
+    //
+    // The following adds the package dependencies of the recipes to the repo as
+    // well.
+    let recipe_list = Package::new_recursive(
+        &args.map(PackageName::new).collect::<Result<Vec<_>, _>>()?,
+        WALK_DEPTH,
+    )?
+    .into_iter()
+    .map(|pkg| pkg.name.as_str().to_owned())
+    .collect::<Vec<_>>();
+
     let mut appstream_sources: HashMap<String, PathBuf> = HashMap::new();
     let mut packages: BTreeMap<String, String> = BTreeMap::new();