diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-11 00:12:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-11 00:12:54 +0000 |
| commit | 97e35dcd05fce75e38c5cfbe9710cd52df99a2e4 (patch) | |
| tree | 395d39869128e4dece302746f1364cf9e80f4028 /pkgs/applications/science/logic | |
| parent | 84269dc031052cb3a0ca0c5b43b68bf49a840d4e (diff) | |
| parent | 3668a9ff627ac3425eff56ad5a0d62391a6ae65b (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch | 10 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/elan/default.nix | 10 |
2 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch index 74da9d854f344..0b33d4242eb7e 100644 --- a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch @@ -2,7 +2,7 @@ diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/componen index c51e76d..ae8159e 100644 --- a/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 .unpack(&full_path) .chain_err(|| ErrorKind::ExtractingPackage)?; @@ -26,9 +26,11 @@ index c51e76d..ae8159e 100644 + use std::os::unix::fs::PermissionsExt; + let new_path = dest_path.with_extension("orig"); + ::std::fs::rename(dest_path, &new_path)?; -+ ::std::fs::write(dest_path, format!(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 -+"#, new_path.to_str().unwrap(), dest_path.parent().unwrap().parent().unwrap().to_str().unwrap()))?; ++ ::std::fs::write(dest_path, r#"#! @shell@ ++dir="$(dirname "${BASH_SOURCE[0]}")" ++# 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))?; + } + diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 129aacc07f62a..245f8db13ce60 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -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 }: rustPlatform.buildRustPackage rec { @@ -23,14 +23,6 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "no-self-update" ]; 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. # This is necessary because Lean 4 is now dynamically linked. (runCommand "0001-dynamically-patchelf-binaries.patch" { |