anchor.diff:    # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
     callPackage = pkgs.newScope {};
   
  -  callPackages = lib.callPackagesWith splicedPackages;
  +  callPackages = lib.callPackagesWith splicedPackagesWithXorg;
   
  -  newScope = extra: lib.callPackageWith (splicedPackages // extra);
  +  newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // extra);
   
     # Haskell package sets need this because they reimplement their own
     # `newScope`.
  
positive.code:                    } @ args:
      if actuallySplice then spliceReal args else pkgsHostTarget;
  
    splicedPackages = splicePackages {
      pkgsBuildBuild = defaultBuildBuildScope;
      pkgsBuildHost = defaultBuildHostScope;
      pkgsBuildTarget = defaultBuildTargetScope;
      pkgsHostHost = defaultHostHostScope;
      pkgsHostTarget = defaultHostTargetScope;
      pkgsTargetTarget = defaultTargetTargetScope;
    } // {
      # These should never be spliced under any circumstances
      inherit (pkgs) pkgs buildPackages targetPackages;
      inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform;
    };
  
  in
  
  
negative.code: lib: pkgs: actuallySplice:
  
  let
  
    spliceReal = { pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
                 , pkgsHostHost, pkgsHostTarget
  