cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

elan: overwrite llvm-ar with stdenv ar

Browse source
This commit is contained in:
Gabriel Ebner 2022-08-22 16:52:52 +02:00
parent f85882b23a
commit e99329eb02
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch
View file

@ -2,7 +2,7 @@ diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/componen
index c51e76d..ae8159e 100644 index c51e76d..ae8159e 100644
--- a/src/elan-dist/src/component/package.rs --- a/src/elan-dist/src/component/package.rs
+++ b/src/elan-dist/src/component/package.rs +++ b/src/elan-dist/src/component/package.rs
@@ -56,6 +56,30 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) @@ -56,6 +56,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path)
entry entry
.unpack(&full_path) .unpack(&full_path)
.chain_err(|| ErrorKind::ExtractingPackage)?; .chain_err(|| ErrorKind::ExtractingPackage)?;
@ -30,6 +30,11 @@ index c51e76d..ae8159e 100644
+LEAN_CC="${{LEAN_CC:-@cc@}}" exec -a "$0" {} "$@" -L {}/lib # use bundled libraries, but not bundled compiler that doesn't know about NIX_LDFLAGS +LEAN_CC="${{LEAN_CC:-@cc@}}" exec -a "$0" {} "$@" -L {}/lib # use bundled libraries, but not bundled compiler that doesn't know about NIX_LDFLAGS
+"#, new_path.to_str().unwrap(), dest_path.parent().unwrap().parent().unwrap().to_str().unwrap()))?; +"#, new_path.to_str().unwrap(), dest_path.parent().unwrap().parent().unwrap().to_str().unwrap()))?;
+ ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?; + ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?;
+ }
+
+ if dest_path.file_name() == Some(::std::ffi::OsStr::new("llvm-ar")) {
+ ::std::fs::remove_file(dest_path)?;
+ ::std::os::unix::fs::symlink("@ar@", dest_path)?;
} }
Ok(()) Ok(())

2
pkgs/applications/science/logic/elan/default.nix
View file

@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec {
(runCommand "0001-dynamically-patchelf-binaries.patch" { (runCommand "0001-dynamically-patchelf-binaries.patch" {
CC = stdenv.cc; CC = stdenv.cc;
cc = "${stdenv.cc}/bin/cc"; cc = "${stdenv.cc}/bin/cc";
ar = "${stdenv.cc}/bin/ar";
patchelf = patchelf; patchelf = patchelf;
shell = runtimeShell; shell = runtimeShell;
} '' } ''
@ -36,6 +37,7 @@ rustPlatform.buildRustPackage rec {
--subst-var patchelf \ --subst-var patchelf \
--subst-var dynamicLinker \ --subst-var dynamicLinker \
--subst-var cc \ --subst-var cc \
--subst-var ar \
--subst-var shell --subst-var shell
'') '')
]; ];