mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity

Merge pull request #144109 from gebner/elan130

Browse source
This commit is contained in:
Sandro 2021-11-01 14:19:59 +01:00 committed by GitHub
parent 64ccb795db f13aa788e1
commit 6a1312549f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 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

@ -1,11 +1,11 @@
diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs
index fd9fe74..0fefa39 100644
index c51e76d..d0a26d7 100644
--- a/src/elan-dist/src/component/package.rs
+++ b/src/elan-dist/src/component/package.rs
@@ -50,11 +50,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path)
};
try!(entry.unpack(&full_path).chain_err(|| ErrorKind::ExtractingPackage));
@@ -56,11 +56,35 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path)
entry
.unpack(&full_path)
.chain_err(|| ErrorKind::ExtractingPackage)?;
+ nix_patchelf_if_needed(&full_path);
}

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

@ -7,16 +7,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "elan";
version = "1.2.0";
version = "1.3.0";
src = fetchFromGitHub {
owner = "leanprover";
repo = "elan";
rev = "v${version}";
sha256 = "0q3gay0j45c6cmykbis14gmc7xm89d0gqyz7lnysl0pgr5k20j6b";
sha256 = "0gql015zb3y95v68kmv2dscz7fnh89x1shrqxxqk5a0jhd2z93n1";
};
cargoSha256 = "1cklpi40fbiwz8m9p0cknmslpj0vwpr0x8j02vam6sng9dsb50i9";
cargoSha256 = "sha256-rL++3RstCSBMYFj9BeOo6gepfId/sje4ES3Wm+Mb4cQ=";
nativeBuildInputs = [ pkg-config makeWrapper ];