From af10a630438ce23c265b2016e8a6066415be4605 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Sat, 9 Mar 2024 16:50:49 +0100 Subject: [PATCH] Revert "elan: revert temporary directory creation" This reverts commit 66e4e61595be917977b010ef319483e13aa1ab6c. --- pkgs/applications/science/logic/elan/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 129aacc07f62..245f8db13ce6 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" {