mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-02 11:03:57 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
diff --git a/src/toolchains.rs b/src/toolchains.rs
|
|
index 53a7ddb..795a711 100644
|
|
--- a/src/toolchains.rs
|
|
+++ b/src/toolchains.rs
|
|
@@ -206,6 +206,8 @@ impl Toolchain {
|
|
})?;
|
|
}
|
|
|
|
+ nix_patchelf(tmpdir.path().to_path_buf())
|
|
+ .expect("failed to patch toolchain for NixOS");
|
|
fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)
|
|
}
|
|
|
|
@@ -533,3 +535,42 @@ fn download_tarball(
|
|
res => res,
|
|
}
|
|
}
|
|
+
|
|
+fn nix_patchelf(mut toolchain_path: PathBuf) -> io::Result<()> {
|
|
+ toolchain_path.push("bin");
|
|
+
|
|
+ for entry in toolchain_path.read_dir()? {
|
|
+ let entry = entry?;
|
|
+ if !entry.file_type()?.is_file() {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ eprintln!("info: you seem to be running NixOS. Attempting to patch {}",
|
|
+ entry.path().to_str().unwrap());
|
|
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
|
+ .arg("--set-interpreter")
|
|
+ .arg("@dynamicLinker@")
|
|
+ .arg(entry.path())
|
|
+ .output();
|
|
+ }
|
|
+
|
|
+ toolchain_path.pop();
|
|
+ toolchain_path.push("lib");
|
|
+
|
|
+ for entry in toolchain_path.read_dir()? {
|
|
+ let entry = entry?;
|
|
+ if !entry.file_type()?.is_file() {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ eprintln!("info: you seem to be running NixOS. Attempting to patch {}",
|
|
+ entry.path().to_str().unwrap());
|
|
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
|
+ .arg("--set-rpath")
|
|
+ .arg("@libPath@")
|
|
+ .arg(entry.path())
|
|
+ .output();
|
|
+ }
|
|
+
|
|
+ Ok(())
|
|
+}
|