diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/by-name/li/libfakeXinerama/package.nix
similarity index 88%
rename from pkgs/tools/X11/xpra/libfakeXinerama.nix
rename to pkgs/by-name/li/libfakeXinerama/package.nix
index 2b533c1aacca..51f16727c4ec 100644
--- a/pkgs/tools/X11/xpra/libfakeXinerama.nix
+++ b/pkgs/by-name/li/libfakeXinerama/package.nix
@@ -6,12 +6,12 @@
   libXinerama,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libfakeXinerama";
   version = "0.1.0";
 
   src = fetchurl {
-    url = "https://www.xpra.org/src/${pname}-${version}.tar.bz2";
+    url = "https://www.xpra.org/src/libfakeXinerama-${finalAttrs.version}.tar.bz2";
     sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx";
   };
 
@@ -46,4 +46,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.nickcao ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/tools/X11/xpra/0002-Constant-DPI.patch b/pkgs/by-name/xp/xpra/0002-Constant-DPI.patch
similarity index 100%
rename from pkgs/tools/X11/xpra/0002-Constant-DPI.patch
rename to pkgs/by-name/xp/xpra/0002-Constant-DPI.patch
diff --git a/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch b/pkgs/by-name/xp/xpra/0003-fix-pointer-limits.patch
similarity index 100%
rename from pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch
rename to pkgs/by-name/xp/xpra/0003-fix-pointer-limits.patch
diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/by-name/xp/xpra/fix-122159.patch
similarity index 100%
rename from pkgs/tools/X11/xpra/fix-122159.patch
rename to pkgs/by-name/xp/xpra/fix-122159.patch
diff --git a/pkgs/tools/X11/xpra/fix-41106.patch b/pkgs/by-name/xp/xpra/fix-41106.patch
similarity index 100%
rename from pkgs/tools/X11/xpra/fix-41106.patch
rename to pkgs/by-name/xp/xpra/fix-41106.patch
diff --git a/pkgs/tools/X11/xpra/nvenc.pc b/pkgs/by-name/xp/xpra/nvenc.pc
similarity index 100%
rename from pkgs/tools/X11/xpra/nvenc.pc
rename to pkgs/by-name/xp/xpra/nvenc.pc
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/by-name/xp/xpra/package.nix
similarity index 100%
rename from pkgs/tools/X11/xpra/default.nix
rename to pkgs/by-name/xp/xpra/package.nix
diff --git a/pkgs/tools/X11/xpra/update.sh b/pkgs/by-name/xp/xpra/update.sh
similarity index 100%
rename from pkgs/tools/X11/xpra/update.sh
rename to pkgs/by-name/xp/xpra/update.sh
diff --git a/pkgs/by-name/xp/xpraWithNvenc/package.nix b/pkgs/by-name/xp/xpraWithNvenc/package.nix
new file mode 100644
index 000000000000..169c3a657a19
--- /dev/null
+++ b/pkgs/by-name/xp/xpraWithNvenc/package.nix
@@ -0,0 +1,8 @@
+{
+  xpra,
+  linuxPackages,
+}:
+xpra.override {
+  withNvenc = true;
+  nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4ab602b269e..1e393e3a0c93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16805,13 +16805,6 @@ with pkgs;
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
-  xpra = callPackage ../tools/X11/xpra { };
-  xpraWithNvenc = callPackage ../tools/X11/xpra {
-    withNvenc = true;
-    nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
-  };
-  libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
-
   xmp = callPackage ../applications/audio/xmp {
     inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
   };