Merge pull request #294514 from nomeata/joachim/elan

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)?;

+        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))?;

+    }

+

{ 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 {

  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" {