diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/by-name/zs/zsnes2/package.nix
similarity index 80%
rename from pkgs/applications/emulators/zsnes/2.x.nix
rename to pkgs/by-name/zs/zsnes2/package.nix
index 5a313443fee7..3b679e94ceed 100644
--- a/pkgs/applications/emulators/zsnes/2.x.nix
+++ b/pkgs/by-name/zs/zsnes2/package.nix
@@ -1,19 +1,10 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
-  SDL,
-  libGL,
-  libGLU,
-  libpng,
-  libx11,
-  nasm,
-  pkg-config,
-  zlib,
-  udevCheckHook,
+  pkgsi686Linux,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+pkgsi686Linux.stdenv.mkDerivation (finalAttrs: {
   pname = "zsnes2";
   version = "2.0.12";
 
@@ -25,18 +16,18 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    nasm
-    pkg-config
-    udevCheckHook
+    pkgsi686Linux.nasm
+    pkgsi686Linux.pkg-config
+    pkgsi686Linux.udevCheckHook
   ];
 
   buildInputs = [
-    SDL
-    libGL
-    libGLU
-    libpng
-    libx11
-    zlib
+    pkgsi686Linux.SDL
+    pkgsi686Linux.libGL
+    pkgsi686Linux.libGLU
+    pkgsi686Linux.libpng
+    pkgsi686Linux.libx11
+    pkgsi686Linux.zlib
   ];
 
   dontConfigure = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0467c1e73a3e..384ac53bc2cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1257,8 +1257,6 @@ with pkgs;
 
   winetricks = callPackage ../applications/emulators/wine/winetricks.nix { };
 
-  zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { };
-
   ### APPLICATIONS/EMULATORS/RETROARCH
 
   libretro = recurseIntoAttrs (callPackage ../applications/emulators/libretro { });