Fix building in Nix flake (#35)

tesujimath · Oct 18, 2024 · e1e410a · e1e410a
1 parent c11d3e0
commit e1e410a
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nu_plugin_bash_env"
-version = "0.16.0"
+version = "0.16.1"
 edition = "2021"
 license = "MIT"
 description = "Nu plugin bash-env"
@@ -21,3 +21,6 @@ subprocess = "0.2.9"
 tempfile = "3.12.0"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+
+[build-dependencies]
+anyhow = "1.0.86"
diff --git a/README.md b/README.md
@@ -29,8 +29,8 @@ The following versions are compatible.
 |    0.96 |          0.12.1 |
 |    0.97 |          0.13.0 |
 |    0.98 |          0.14.2 |
-|    0.98 |          0.15.0 |
-|    0.99 |          0.16.0 |
+|    0.98 |          0.15.1 |
+|    0.99 |          0.16.1 |
 
 If you find a new version of Nushell rejects this plugin as incompatible, please report an [issue](https://github.com/tesujimath/nu_plugin_bash_env/issues).
 

diff --git a/build.rs b/build.rs
@@ -1,14 +1,74 @@
+use anyhow::anyhow;
 use std::{
     env,
+    fs::{copy, create_dir},
     path::{Path, PathBuf},
 };
 
-const BASH_ENV_JSON_VERSION: &str = "0.6.1";
+// If fetching bash-env-json directly from GitHub, this defines what we fetch.
+// Note that when building the package from the Nix Flake, this is not used.
+// In that case, the package version is as defined in the Flake input.
+const BASH_ENV_JSON_GITHUB_TAG: &str = "0.6.1";
 
-fn fetch_bash_env_json() -> Option<PathBuf> {
-    let out_dir: PathBuf = env::var("OUT_DIR").unwrap().into();
+// install bash-env-json locally if available
+fn install_nix_bash_env_json<P>(out_dir: P) -> Option<PathBuf>
+where
+    P: AsRef<Path>,
+{
+    match env::var("NIX_BASH_ENV_JSON") {
+        Err(_) => {
+            println!("cargo:warning=install_nix_bash_env_json failed to find NIX_BASH_ENV_JSON, falling back to fetch from GitHub");
+            None
+        }
+        Ok(bash_env_json) => {
+            let src_path: PathBuf = bash_env_json.into();
+
+            let bash_env_json_repo_dir = PathBuf::from("bash-env-json");
+            let bash_env_json_repo_path = out_dir.as_ref().join(bash_env_json_repo_dir.as_path());
+
+            match create_dir(&bash_env_json_repo_path) {
+                Err(e) => {
+                    println!(
+                        "cargo:warning=install_nix_bash_env_json failed to create directory {}: {}",
+                        bash_env_json_repo_path.to_string_lossy(),
+                        e
+                    );
+                    None
+                }
+                Ok(_) => {
+                    let dst_path = bash_env_json_repo_path.join("bash-env-json");
+                    match copy(&src_path, &dst_path) {
+                        Err(e) => {
+                            println!(
+                                "cargo:warning=install_nix_bash_env_json failed to copy {} to {}: {}",
+                                src_path.to_string_lossy(),
+                                &dst_path.to_string_lossy(),
+                                e
+                            );
+                            None
+                        }
+                        Ok(_) => {
+                            println!(
+                                "cargo:warning=install_nix_bash_env_json installed {} as {}",
+                                src_path.to_string_lossy(),
+                                &dst_path.to_string_lossy(),
+                            );
+                            Some(dst_path)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+// fetch bash-env-json from GitHub
+fn fetch_bash_env_json<P>(out_dir: P) -> Option<PathBuf>
+where
+    P: AsRef<Path>,
+{
     let bash_env_json_repo_dir = PathBuf::from("bash-env-json");
-    let bash_env_json_repo_path = out_dir.join(bash_env_json_repo_dir.as_path());
+    let bash_env_json_repo_path = out_dir.as_ref().join(bash_env_json_repo_dir.as_path());
 
     if Path::exists(&bash_env_json_repo_path) {
         Some(bash_env_json_repo_path)
@@ -18,7 +78,7 @@ fn fetch_bash_env_json() -> Option<PathBuf> {
             "clone",
             "--filter=blob:none",
             "--branch",
-            BASH_ENV_JSON_VERSION,
+            BASH_ENV_JSON_GITHUB_TAG,
             "https://github.com/tesujimath/bash-env-json.git",
             bash_env_json_repo_path_str.as_ref(),
         ];
@@ -45,10 +105,14 @@ fn fetch_bash_env_json() -> Option<PathBuf> {
     }
 }
 
-fn main() -> std::io::Result<()> {
-    if let Some(_bash_env_json_repo_path) = fetch_bash_env_json() {
-        // TODO what now?
-    }
+fn main() -> anyhow::Result<()> {
+    let out_dir: PathBuf = env::var("OUT_DIR").unwrap().into();
 
-    Ok(())
+    match install_nix_bash_env_json(&out_dir) {
+        Some(_path) => Ok(()),
+        None => match fetch_bash_env_json(&out_dir) {
+            Some(_path) => Ok(()),
+            None => Err(anyhow!("failed to fetch bash-env-json from GitHub")),
+        },
+    }
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,7 +9,7 @@
     flake-utils.url = "github:numtide/flake-utils";
 
     bash-env-json = {
-      url = "github:tesujimath/bash-env-json/main";
+      url = "github:tesujimath/bash-env-json?ref=refs/tags/0.6.1";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -24,21 +24,24 @@
             inherit system overlays;
           };
 
+          inherit (pkgs) rust-bin writeShellScriptBin;
           flakePkgs = {
             bash-env-json = bash-env-json.packages.${system}.default;
           };
 
           # cargo-nightly based on https://github.com/oxalica/rust-overlay/issues/82
-          nightly = pkgs.rust-bin.selectLatestNightlyWith (t: t.default);
-          cargo-nightly = pkgs.writeShellScriptBin "cargo-nightly" ''
+          nightly = rust-bin.selectLatestNightlyWith (t: t.default);
+          cargo-nightly = writeShellScriptBin "cargo-nightly" ''
             export RUSTC="${nightly}/bin/rustc";
             exec "${nightly}/bin/cargo" "$@"
           '';
 
           nu_plugin_bash_env =
-            let cargoConfig = builtins.fromTOML (builtins.readFile ./Cargo.toml);
+            let
+              inherit (pkgs) lib makeWrapper rustPlatform;
+              cargoConfig = builtins.fromTOML (builtins.readFile ./Cargo.toml);
             in
-            pkgs.rustPlatform.buildRustPackage
+            rustPlatform.buildRustPackage
               {
                 pname = "nu_plugin_bash_env";
                 version = cargoConfig.package.version;
@@ -49,35 +52,50 @@
                   lockFile = ./Cargo.lock;
                 };
 
-                meta = with pkgs.lib; {
+                meta = with lib; {
                   description = "A Bash environment plugin for Nushell";
                   homepage = "https://github.com/tesujimath/nu_plugin_bash_env";
                   license = licenses.mit;
                   maintainers = [ maintainers.tailhook ];
                 };
 
                 buildInputs = [
-                  pkgs.makeWrapper
+                  makeWrapper
                   flakePkgs.bash-env-json
                 ];
 
+
+                preBuild = ''
+                  export NIX_BASH_ENV_JSON=${flakePkgs.bash-env-json}/bin/bash-env-json
+                '';
+
                 postFixup = ''
                   wrapProgram $out/bin/nu_plugin_bash_env --set NU_PLUGIN_BASH_ENV_JSON ${flakePkgs.bash-env-json}/bin/bash-env-json
                 '';
               };
         in
-        with pkgs;
         {
-          devShells.default = mkShell {
-            nativeBuildInputs = [
-              bashInteractive
-              jq
-              cargo-modules
-              cargo-nightly
-              cargo-udeps
-              rust-bin.stable.latest.default
-            ];
-          };
+          devShells.default =
+            let
+              inherit (pkgs)
+                mkShell
+                bashInteractive
+                jq
+                cargo-modules
+                cargo-udeps
+                rust-bin;
+            in
+
+            mkShell {
+              nativeBuildInputs = [
+                bashInteractive
+                jq
+                cargo-modules
+                cargo-nightly
+                cargo-udeps
+                rust-bin.stable.latest.default
+              ];
+            };
 
           packages.default = nu_plugin_bash_env;
         }