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

Merge pull request #294514 from nomeata/joachim/elan

Browse source 
fix: elan: use relative paths in wrapper script
This commit is contained in:
Mauricio Collares 2024-03-10 12:46:36 +01:00 committed by GitHub
commit 79435d8c63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
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,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path) @@ -56,6 +56,37 @@ 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)?;
@ -26,9 +26,11 @@ index c51e76d..ae8159e 100644
+ use std::os::unix::fs::PermissionsExt; + use std::os::unix::fs::PermissionsExt;
+ let new_path = dest_path.with_extension("orig"); + let new_path = dest_path.with_extension("orig");
+ ::std::fs::rename(dest_path, &new_path)?; + ::std::fs::rename(dest_path, &new_path)?;
+ ::std::fs::write(dest_path, format!(r#"#! @shell@ + ::std::fs::write(dest_path, r#"#! @shell@
+LEAN_CC="${{LEAN_CC:-@cc@}}" exec -a "$0" {} "$@" -L {}/lib # use bundled libraries, but not bundled compiler that doesn't know about NIX_LDFLAGS +dir="$(dirname "${BASH_SOURCE[0]}")"
+"#, new_path.to_str().unwrap(), dest_path.parent().unwrap().parent().unwrap().to_str().unwrap()))?; +# use bundled libraries, but not bundled compiler that doesn't know about NIX_LDFLAGS
+LEAN_CC="${LEAN_CC:-@cc@}" exec -a "$0" "$dir/leanc.orig" "$@" -L"$dir/../lib"
+"#)?;
+ ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?; + ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?;
+ } + }
+ +

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

@ -1,4 +1,4 @@
{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell, fetchpatch { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell
, openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }: , openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -23,14 +23,6 @@ rustPlatform.buildRustPackage rec {
buildFeatures = [ "no-self-update" ]; buildFeatures = [ "no-self-update" ];
patches = lib.optionals stdenv.isLinux [ patches = lib.optionals stdenv.isLinux [
# revert temporary directory creation, because it break the wrapper
# https://github.com/NixOS/nixpkgs/pull/289941#issuecomment-1980778358
(fetchpatch {
url = "https://github.com/leanprover/elan/commit/bd54acaab75d08b3912ee1f051af8657f3a9cfdf.patch";
hash = "sha256-6If/wxWSea8Zjlp3fx9wh3D0TjmWZbvCuY9q5c2qJGA=";
revert = true;
})
# Run patchelf on the downloaded binaries. # Run patchelf on the downloaded binaries.
# This is necessary because Lean 4 is now dynamically linked. # This is necessary because Lean 4 is now dynamically linked.
(runCommand "0001-dynamically-patchelf-binaries.patch" { (runCommand "0001-dynamically-patchelf-binaries.patch" {