From 1c8f173ccd6d67a4d773436b1f164b47762e47b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?=
 <22820003+c4f3z1n@users.noreply.github.com>
Date: Thu, 17 Apr 2025 01:14:55 +0200
Subject: [PATCH] nix-ld: 2.0.3 -> 2.0.4

https://github.com/nix-community/nix-ld/releases/tag/2.0.4
---
 pkgs/by-name/ni/nix-ld/package.nix     |  8 +++---
 pkgs/by-name/ni/nix-ld/rust-1.83.patch | 36 --------------------------
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/by-name/ni/nix-ld/rust-1.83.patch

diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix
index 8e5463525dc8..c4619b89f1a7 100644
--- a/pkgs/by-name/ni/nix-ld/package.nix
+++ b/pkgs/by-name/ni/nix-ld/package.nix
@@ -8,19 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-ld";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-ld";
     rev = version;
-    hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=";
+    hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk=";
   };
 
-  patches = [ ./rust-1.83.patch ];
-
   useFetchCargoVendor = true;
-  cargoHash = "sha256-2CFdUZbKFl7cf6dik6XextuGG2vLM9oNS8rIyzLnfM4=";
+  cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc=";
 
   hardeningDisable = [ "stackprotector" ];
 
diff --git a/pkgs/by-name/ni/nix-ld/rust-1.83.patch b/pkgs/by-name/ni/nix-ld/rust-1.83.patch
deleted file mode 100644
index 8ff1fb7d9ce7..000000000000
--- a/pkgs/by-name/ni/nix-ld/rust-1.83.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/src/arch.rs
-+++ b/src/arch.rs
-@@ -142,7 +142,7 @@ cfg_match! {
- 
-         #[naked]
-         unsafe extern "C" fn entry_trampoline() -> ! {
--            core::arch::asm!(
-+            core::arch::naked_asm!(
-                 "lea r10, [rip + {context}]",
-                 "mov r11, [r10 + {size} * 1]", // .env_entry
-                 "test r11, r11",
-@@ -153,7 +153,6 @@ cfg_match! {
-                 "jmp [rip + {context}]",
-                 context = sym TRAMPOLINE_CONTEXT,
-                 size = const core::mem::size_of::<*const u8>(),
--                options(noreturn),
-             )
-         }
-     }
-@@ -162,7 +161,7 @@ cfg_match! {
- 
-         #[naked]
-         unsafe extern "C" fn entry_trampoline() -> ! {
--            core::arch::asm!(
-+            core::arch::naked_asm!(
-                 "adrp x8, {context}",
-                 "ldr x9, [x8, {env_entry_off}]", // .env_entry
-                 "cbz x9, 2f",
-@@ -174,7 +173,6 @@ cfg_match! {
-                 context = sym TRAMPOLINE_CONTEXT,
-                 env_entry_off = const TrampolineContext::ENV_ENTRY_OFFSET,
-                 env_string_off = const TrampolineContext::ENV_STRING_OFFSET,
--                options(noreturn),
-             )
-         }
-     }