diff --git a/pkgs/tools/misc/gwe/default.nix b/pkgs/by-name/gw/gwe/package.nix
similarity index 93%
rename from pkgs/tools/misc/gwe/default.nix
rename to pkgs/by-name/gw/gwe/package.nix
index 97dc53555fef..848df337bc3d 100644
--- a/pkgs/tools/misc/gwe/default.nix
+++ b/pkgs/by-name/gw/gwe/package.nix
@@ -14,7 +14,7 @@
   libdazzle,
   libappindicator-gtk3,
   libnotify,
-  nvidia_x11,
+  linuxPackages,
 }:
 
 let
@@ -34,15 +34,16 @@ let
       setuptools
     ]
   );
+  nvidia_x11 = linuxPackages.nvidia_x11;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gwe";
   version = "0.15.9";
 
   src = fetchFromGitLab {
     owner = "leinardi";
-    repo = pname;
-    rev = version;
+    repo = "gwe";
+    tag = finalAttrs.version;
     hash = "sha256-agq967QN1nsAOn+1Ce64+id7UlSS/K3XGsUUihWOztk=";
   };
 
@@ -100,4 +101,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     mainProgram = "gwe";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8b248ec2a95..0c9509e23c41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4313,10 +4313,6 @@ with pkgs;
 
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { });
 
-  gwe = callPackage ../tools/misc/gwe {
-    nvidia_x11 = linuxPackages.nvidia_x11;
-  };
-
   gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
 
   idrisPackages = recurseIntoAttrs (