diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/by-name/qu/quartz-wm/package.nix
similarity index 93%
rename from pkgs/servers/x11/quartz-wm/default.nix
rename to pkgs/by-name/qu/quartz-wm/package.nix
index 185cf1831f5a..65b3708a7f1b 100644
--- a/pkgs/servers/x11/quartz-wm/default.nix
+++ b/pkgs/by-name/qu/quartz-wm/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  clangStdenv,
   fetchgit,
   autoreconfHook,
   pixman,
@@ -13,7 +13,7 @@
   libXext,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "quartz-wm";
   version = "1.3.2";
 
diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/by-name/xc/xcbutilxrm/package.nix
similarity index 100%
rename from pkgs/servers/x11/xorg/xcb-util-xrm.nix
rename to pkgs/by-name/xc/xcbutilxrm/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f64fe70796bc..19b97af60743 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8421,8 +8421,6 @@ with pkgs;
   xcb-util-cursor = xorg.xcbutilcursor;
   xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { };
 
-  xcbutilxrm = callPackage ../servers/x11/xorg/xcb-util-xrm.nix { };
-
   xgboostWithCuda = xgboost.override { cudaSupport = true; };
 
   zlib = callPackage ../development/libraries/zlib {
@@ -9428,10 +9426,6 @@ with pkgs;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  quartz-wm = callPackage ../servers/x11/quartz-wm {
-    stdenv = clangStdenv;
-  };
-
   xorg =
     let
       # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage`