fixing typo

lf-lang · Nov 9, 2023 · 15bcfe1 · 15bcfe1
1 parent cc1bc7a
commit 15bcfe1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/derivation.nix b/derivation.nix
@@ -1,4 +1,4 @@
-{ naersk, src, lib, pkg-config, cmake, zlib, openssl }:
+{ naersk, src, lib, pkg-config, cmake, zlib, openssl, glibc}:
 
 naersk.buildPackage {
   pname = "lingo";
@@ -8,8 +8,8 @@ naersk.buildPackage {
 
   cargoSha256 = lib.fakeSha256;
 
-  nativeBuildInputs = [ pkg-config cmake ];
-  buildInputs = [ zlib openssl ];
+  nativeBuildInputs = [ pkg-config cmake zlib openssl glibc];
+  buildInputs = [  ];
 
   meta = with lib; {
     description = "Simple package manager for lingua franca";

diff --git a/flake.lock b/flake.lock
diff --git a/src/backends/cmake.rs b/src/backends/cmake.rs
@@ -12,6 +12,7 @@ use crate::backends::{
 pub struct Cmake;
 
 fn gen_cmake_files(app: &App, options: &BuildCommandOptions) -> BuildResult {
+    println!("ERROR: {:?}", app.src_dir_path());
     let build_dir = app.output_root.join("build");
     fs::create_dir_all(&build_dir)?;
 
@@ -84,6 +85,7 @@ fn do_cmake_build(results: &mut BatchBuildResults, options: &BuildCommandOptions
             let cmake_binary_name = app.main_reactor.file_stem().unwrap();
             // cleanup: rename executable to match the app name
             let bin_dir = app.output_root.join("bin");
+            println!("moving {:?} to {:?}", bin_dir.join(cmake_binary_name), app.executable_path());
             fs::rename(bin_dir.join(cmake_binary_name), app.executable_path())?;
             Ok(())
         });

diff --git a/src/package/mod.rs b/src/package/mod.rs
@@ -119,7 +119,7 @@ impl App {
 
     pub fn src_dir_path(&self) -> Option<PathBuf> {
         for path in self.main_reactor.ancestors() {
-            if path.ends_with("sec") {
+            if path.ends_with("src") {
                 return Some(path.clone().to_path_buf());
             }
         }