From f7f415d0995c3ef70ccc7cd2be28cf61bcffe615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Ci=C4=99=C5=BCarkiewicz?= <dpc@dpc.pw>
Date: Mon, 10 Nov 2025 21:33:25 -0800
Subject: [PATCH] wild: make wrapped default, add wild-unwrapped

---
 .../wi/{wild => wild-unwrapped}/adapterTest.nix      |  4 ++--
 pkgs/by-name/wi/{wild => wild-unwrapped}/package.nix |  4 ++--
 pkgs/stdenv/adapters.nix                             |  2 +-
 pkgs/top-level/all-packages.nix                      | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename pkgs/by-name/wi/{wild => wild-unwrapped}/adapterTest.nix (98%)
 rename pkgs/by-name/wi/{wild => wild-unwrapped}/package.nix (91%)

diff --git a/pkgs/by-name/wi/wild/adapterTest.nix b/pkgs/by-name/wi/wild-unwrapped/adapterTest.nix
similarity index 98%
rename from pkgs/by-name/wi/wild/adapterTest.nix
rename to pkgs/by-name/wi/wild-unwrapped/adapterTest.nix
index 44f80e2634e9..aaa578b97857 100644
--- a/pkgs/by-name/wi/wild/adapterTest.nix
+++ b/pkgs/by-name/wi/wild-unwrapped/adapterTest.nix
@@ -7,7 +7,7 @@
   runCommandCC,
   makeBinaryWrapper,
   gcc,
-  wild,
+  wild-unwrapped,
   binutils-unwrapped-all-targets,
   clang,
   lld,
@@ -91,7 +91,7 @@ let
     '';
 in
 {
-  testWild = wild.overrideAttrs {
+  testWild = wild-unwrapped.overrideAttrs {
     pname = "wild-tests";
     doCheck = true;
     doInstallCheck = false;
diff --git a/pkgs/by-name/wi/wild/package.nix b/pkgs/by-name/wi/wild-unwrapped/package.nix
similarity index 91%
rename from pkgs/by-name/wi/wild/package.nix
rename to pkgs/by-name/wi/wild-unwrapped/package.nix
index 544a56eebabf..312917e35780 100644
--- a/pkgs/by-name/wi/wild/package.nix
+++ b/pkgs/by-name/wi/wild-unwrapped/package.nix
@@ -9,7 +9,7 @@
   nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "wild";
+  pname = "wild-unwrapped";
   version = "0.7.0";
 
   src = fetchFromGitHub {
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru = {
     updateScript = nix-update-script { };
 
-    tests = callPackage ./adapterTest.nix { wild = finalAttrs.finalPackage; };
+    tests = callPackage ./adapterTest.nix { wild-unwrapped = finalAttrs.finalPackage; };
   };
 
   meta = {
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index d7360aa3360f..5878cbb81a5a 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -345,7 +345,7 @@ rec {
         cc = prev.cc.override {
           bintools = prev.cc.bintools.override {
             extraBuildCommands = ''
-              ln -fs ${pkgs.buildPackages.wild-wrapped}/bin/* "$out/bin"
+              ln -fs ${pkgs.buildPackages.wild}/bin/* "$out/bin"
             '';
           };
         };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aee55e644d31..0e96fd55969b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6805,17 +6805,17 @@ with pkgs;
 
   vcpkg-tool-unwrapped = vcpkg-tool.override { doWrap = false; };
 
-  wild-wrapped =
+  wild =
     let
       ldWrapper = ../build-support/bintools-wrapper/ld-wrapper.sh;
     in
     wrapBintoolsWith {
-      bintools = wild;
+      bintools = wild-unwrapped;
       extraBuildCommands = ''
-        wrap wild ${ldWrapper} ${lib.getExe buildPackages.wild}
-        wrap ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild}
-        wrap ${stdenv.cc.bintools.targetPrefix}ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild}
-        wrap ${stdenv.cc.bintools.targetPrefix}ld ${ldWrapper} ${lib.getExe buildPackages.wild}
+        wrap wild ${ldWrapper} ${lib.getExe buildPackages.wild-unwrapped}
+        wrap ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild-unwrapped}
+        wrap ${stdenv.cc.bintools.targetPrefix}ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild-unwrapped}
+        wrap ${stdenv.cc.bintools.targetPrefix}ld ${ldWrapper} ${lib.getExe buildPackages.wild-unwrapped}
       '';
     };