diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index b21dfabb6e8a..78e7dda459d6 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -2,17 +2,17 @@
 
 let
   baseName = "soi";
-  fileName = "Spheres%20of%20Influence";
   majorVersion = "0.1";
   minorVersion = "1";
   version = "${majorVersion}.${minorVersion}";
   name = "${baseName}-${version}";
-  project = "${baseName}";
 in
 
 stdenv.mkDerivation rec {
+  inherit name;
   src = fetchurl {
-    url = "mirror://sourceforge/project/${project}/${baseName}-${majorVersion}/${fileName}-${version}-Source.tar.gz";
+    url = "mirror://sourceforge/project/${baseName}/${baseName}-${majorVersion}/Spheres%20of%20Influence-${version}-Source.tar.gz";
+    inherit name;
     sha256 = "dfc59319d2962033709bb751c71728417888addc6c32cbec3da9679087732a81";
   };
 
@@ -22,13 +22,10 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A physics-based puzzle game";
-    maintainers = with maintainers;
-    [
-      raskin
-    ];
+    maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     license = licenses.free;
     broken = true;
-   downloadPage = "http://sourceforge.net/projects/soi/files/";
+    downloadPage = "http://sourceforge.net/projects/soi/files/";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba45475229e6..f7822a556f9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3343,7 +3343,7 @@ let
   vnc2flv = callPackage ../tools/video/vnc2flv {};
 
   vncrec = callPackage ../tools/video/vncrec {
-    inherit (xlibs) imake libX11 xproto gccmakedep libXt
+    inherit (xorg) imake libX11 xproto gccmakedep libXt
       libXmu libXaw libXext xextproto libSM libICE libXpm
       libXp;
   };
@@ -6359,7 +6359,7 @@ let
   freeglut = callPackage ../development/libraries/freeglut { };
 
   freenect = callPackage ../development/libraries/freenect {
-      inherit (xlibs) libXi libXmu;
+      inherit (xorg) libXi libXmu;
   };
 
   freetype = callPackage ../development/libraries/freetype { };
@@ -9747,7 +9747,7 @@ let
   dietlibc = callPackage ../os-specific/linux/dietlibc { };
 
   directvnc = callPackage ../os-specific/linux/directvnc {
-    inherit (xlibs) xproto;
+    inherit (xorg) xproto;
   };
 
   dmraid = callPackage ../os-specific/linux/dmraid {
@@ -13569,7 +13569,7 @@ let
   x42-plugins = callPackage ../applications/audio/x42-plugins { };
 
   xaos = callPackage ../applications/graphics/xaos {
-    inherit (xlibs) libXt libX11 libXext xextproto xproto;
+    inherit (xorg) libXt libX11 libXext xextproto xproto;
     libpng = libpng12;
   };
 
@@ -14300,7 +14300,7 @@ let
   xsnow = callPackage ../games/xsnow { };
 
   xsokoban = callPackage ../games/xsokoban {
-    inherit (xlibs) libX11 xproto libXpm libXt;
+    inherit (xorg) libX11 xproto libXpm libXt;
   };
 
   zandronum = callPackage ../games/zandronum { };