uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,56 @@
|
|||
diff --git a/src/toolchains.rs b/src/toolchains.rs
|
||||
index 4d85e7c..b1353c6 100644
|
||||
--- a/src/toolchains.rs
|
||||
+++ b/src/toolchains.rs
|
||||
@@ -259,6 +259,8 @@ impl Toolchain {
|
||||
.map_err(InstallError::Download)?;
|
||||
}
|
||||
|
||||
+ nix_patchelf(tmpdir.path().to_path_buf())
|
||||
+ .expect("failed to patch toolchain for NixOS");
|
||||
fs::rename(tmpdir.into_path(), dest).map_err(InstallError::Move)?;
|
||||
|
||||
Ok(())
|
||||
@@ -557,3 +559,42 @@ pub(crate) fn download_tarball(
|
||||
}
|
||||
download_tar_gz(client, name, &format!("{}.gz", url,), strip_prefix, dest)
|
||||
}
|
||||
+
|
||||
+fn nix_patchelf(mut toolchain_path: PathBuf) -> Result<(), Error> {
|
||||
+ 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(())
|
||||
+}
|
||||
56
pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
Normal file
56
pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, runCommand
|
||||
, patchelf
|
||||
, zlib
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-bisect-rustc";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LEmILWVU6hbh2FmdnQVV1Ob2MQvj+/lCr1hdRoTIOkI=";
|
||||
};
|
||||
|
||||
patches =
|
||||
let
|
||||
patchelfPatch = runCommand "0001-dynamically-patchelf-binaries.patch" {
|
||||
CC = stdenv.cc;
|
||||
patchelf = patchelf;
|
||||
libPath = "$ORIGIN/../lib:${lib.makeLibraryPath [ zlib ]}";
|
||||
}
|
||||
''
|
||||
export dynamicLinker=$(cat $CC/nix-support/dynamic-linker)
|
||||
substitute ${./0001-dynamically-patchelf-binaries.patch} $out \
|
||||
--subst-var patchelf \
|
||||
--subst-var dynamicLinker \
|
||||
--subst-var libPath
|
||||
'';
|
||||
in
|
||||
lib.optionals stdenv.isLinux [ patchelfPatch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
cargoSha256 = "Ls51DQ0yScRhpkuEInCfR45+/WeaUoG935w4BJvwSRk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bisects rustc, either nightlies or CI artifacts";
|
||||
homepage = "https://github.com/rust-lang/${pname}";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ davidtwco ];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue