From 21b40568f1e32448d0989d287ffee28066670306 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 21 Aug 2025 09:09:06 +0200
Subject: [PATCH] wasmer: move to by-name

---
 .../wasmer/default.nix => by-name/wa/wasmer/package.nix}    | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{development/interpreters/wasmer/default.nix => by-name/wa/wasmer/package.nix} (96%)

diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/by-name/wa/wasmer/package.nix
similarity index 96%
rename from pkgs/development/interpreters/wasmer/default.nix
rename to pkgs/by-name/wa/wasmer/package.nix
index 7415fa2e2003..da8a9fe6ce71 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/by-name/wa/wasmer/package.nix
@@ -2,7 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  llvmPackages,
+  llvmPackages_18,
   libffi,
   libxml2,
   withLLVM ? true,
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   buildInputs = lib.optionals withLLVM [
-    llvmPackages.llvm
+    llvmPackages_18.llvm
     libffi
     libxml2
   ];
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
     "wasmer"
   ];
 
-  env.LLVM_SYS_180_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev;
+  env.LLVM_SYS_180_PREFIX = lib.optionalString withLLVM llvmPackages_18.llvm.dev;
 
   # Tests are failing due to `Cannot allocate memory` and other reasons
   doCheck = false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 629cd6b8794b..043fdf15e6d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15769,10 +15769,6 @@ with pkgs;
 
   wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };
 
-  wasmer = callPackage ../development/interpreters/wasmer {
-    llvmPackages = llvmPackages_18;
-  };
-
   wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { };
 
   winePackagesFor =