Skip to content

allow custom nix store #352

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

Open
dguibert wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow custom nix store #352

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
17 changes: 15 additions & 2 deletions src/push.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ use tokio::process::Command;

#[derive(Error, Debug)]
pub enum PushProfileError {
#[error("Failed to run Nix eval command: {0}")]
EvalStore(std::io::Error),
#[error("Nixeval command ouput contained an invalid UTF-8 sequence: {0}")]
EvalStoreUtf8(std::str::Utf8Error),
#[error("Failed to run Nix show-derivation command: {0}")]
ShowDerivation(std::io::Error),
#[error("Nix show-derivation command resulted in a bad exit code: {0:?}")]
Expand Down Expand Up @@ -247,10 +251,19 @@ pub async fn build_profile(data: PushProfileData<'_>) -> Result<(), PushProfileE

// Nix 2.32+ returns relative paths (without /nix/store/ prefix) in show-derivation output
// Normalize to always use full store paths
let deriver = if deriver_key.starts_with("/nix/store/") {
let nix_store_output = Command::new("nix")
.arg("eval")
.arg("--raw")
.arg("--expr")
.arg("builtins.storeDir")
.output().await
.map_err(PushProfileError::EvalStore)?;
let nix_store = std::str::from_utf8(&nix_store_output.stdout).map_err(PushProfileError::EvalStoreUtf8)?;

let deriver = if deriver_key.starts_with(nix_store) {
deriver_key.to_string()
} else {
format!("/nix/store/{}", deriver_key)
format!("{}/{}", nix_store, deriver_key)
};

let new_deriver = if data.supports_flakes || data.deploy_data.merged_settings.remote_build.unwrap_or(false) {
Expand Down