diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 8a83d0566465..18007e302a0d 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dEmwVgo9XiU3WtObVL5VbFW7rEzdFfnRepcbyGxX1JM="; + hash = "sha256-4W6quVSkxS2I6KEy3fVyBTypD0fg4EecgeEVM0Yw58s="; }; nativeBuildInputs = [ @@ -34,14 +34,6 @@ stdenv.mkDerivation rec { mimalloc ]; - patches = [ - ./fix-debug-strip.patch # fix --debug-strip; https://github.com/rui314/mold/pull/1038 - ]; - - postPatch = '' - sed -i CMakeLists.txt -e '/.*set(DEST\ .*/d' - ''; - cmakeFlags = [ "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" ]; @@ -66,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rui314/mold"; changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ azahi nitsky ]; + maintainers = with maintainers; [ azahi nitsky paveloom ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/mold/fix-debug-strip.patch b/pkgs/development/tools/mold/fix-debug-strip.patch deleted file mode 100644 index 78906efc73ac..000000000000 --- a/pkgs/development/tools/mold/fix-debug-strip.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b699b73451c57ac01c2680c0b86e1f56ca19e51c Mon Sep 17 00:00:00 2001 -From: Jakub Konka -Date: Sat, 6 May 2023 07:55:46 +0200 -Subject: [PATCH] Fix handling of --debug-strip - -Signed-off-by: Jakub Konka ---- - elf/cmdline.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/elf/cmdline.cc b/elf/cmdline.cc -index 3ac19f237..731af63ab 100644 ---- a/elf/cmdline.cc -+++ b/elf/cmdline.cc -@@ -994,7 +994,7 @@ std::vector parse_nonpositional_args(Context &ctx) { - } else if (read_flag("strip-all") || read_flag("s")) { - ctx.arg.strip_all = true; - } else if (read_flag("strip-debug") || read_flag("S")) { -- ctx.arg.strip_all = true; -+ ctx.arg.strip_debug = true; - } else if (read_flag("warn-unresolved-symbols")) { - ctx.arg.unresolved_symbols = UNRESOLVED_WARN; - } else if (read_flag("error-unresolved-symbols")) {