diff --git a/pkgs/applications/emulators/zsnes/fortify3.patch b/pkgs/by-name/zs/zsnes/fortify3.patch
similarity index 100%
rename from pkgs/applications/emulators/zsnes/fortify3.patch
rename to pkgs/by-name/zs/zsnes/fortify3.patch
diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/by-name/zs/zsnes/package.nix
similarity index 84%
rename from pkgs/applications/emulators/zsnes/default.nix
rename to pkgs/by-name/zs/zsnes/package.nix
index 383e44be626a..6e227599cc70 100644
--- a/pkgs/applications/emulators/zsnes/default.nix
+++ b/pkgs/by-name/zs/zsnes/package.nix
@@ -1,19 +1,11 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
-  nasm,
-  SDL,
-  zlib,
-  libpng,
-  ncurses,
-  libGLU,
-  libGL,
-  makeDesktopItem,
+  pkgsi686Linux,
 }:
 
 let
-  desktopItem = makeDesktopItem {
+  desktopItem = pkgsi686Linux.makeDesktopItem {
     name = "zsnes";
     exec = "zsnes";
     icon = "zsnes";
@@ -24,7 +16,7 @@ let
   };
 
 in
-stdenv.mkDerivation {
+pkgsi686Linux.stdenv.mkDerivation {
   pname = "zsnes";
   version = "1.51";
 
@@ -41,13 +33,13 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    nasm
-    SDL
-    zlib
-    libpng
-    ncurses
-    libGLU
-    libGL
+    pkgsi686Linux.nasm
+    pkgsi686Linux.SDL
+    pkgsi686Linux.zlib
+    pkgsi686Linux.libpng
+    pkgsi686Linux.ncurses
+    pkgsi686Linux.libGLU
+    pkgsi686Linux.libGL
   ];
 
   prePatch = ''
@@ -91,10 +83,7 @@ stdenv.mkDerivation {
     description = "Super Nintendo Entertainment System Emulator";
     license = lib.licenses.gpl2Plus;
     homepage = "https://www.zsnes.com";
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-    ];
+    platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86;
     mainProgram = "zsnes";
   };
 }
diff --git a/pkgs/applications/emulators/zsnes/zlib-1.3.patch b/pkgs/by-name/zs/zsnes/zlib-1.3.patch
similarity index 100%
rename from pkgs/applications/emulators/zsnes/zlib-1.3.patch
rename to pkgs/by-name/zs/zsnes/zlib-1.3.patch
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 fe4f2d48b779..3687b7d55d21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1257,9 +1257,6 @@ with pkgs;
 
   winetricks = callPackage ../applications/emulators/wine/winetricks.nix { };
 
-  zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
-  zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { };
-
   ### APPLICATIONS/EMULATORS/RETROARCH
 
   libretro = recurseIntoAttrs (callPackage ../applications/emulators/libretro { });