soi: reimplement using mkDerivation

1 files changed, 22 insertions, 44 deletions

diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index 7fd13ccab3b0..b21dfabb6e8a 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -1,56 +1,34 @@
-x@{builderDefsPackage
-  , mesa, SDL, cmake, eigen
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, mesa, SDL, cmake, eigen }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="soi";
-    fileName="Spheres%20of%20Influence";
-    majorVersion="0.1";
-    minorVersion="1";
-    version="${majorVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${baseName}-${majorVersion}/${fileName}-${version}-Source.tar.gz";
-    hash="dfc59319d2962033709bb751c71728417888addc6c32cbec3da9679087732a81";
-  };
+let
+  baseName = "soi";
+  fileName = "Spheres%20of%20Influence";
+  majorVersion = "0.1";
+  minorVersion = "1";
+  version = "${majorVersion}.${minorVersion}";
+  name = "${baseName}-${version}";
+  project = "${baseName}";
 in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-    name = "${sourceInfo.name}.tar.gz";
-  };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+stdenv.mkDerivation rec {
+  src = fetchurl {
+    url = "mirror://sourceforge/project/${project}/${baseName}-${majorVersion}/${fileName}-${version}-Source.tar.gz";
+    sha256 = "dfc59319d2962033709bb751c71728417888addc6c32cbec3da9679087732a81";
+  };
 
-  phaseNames = ["setVars" "doCmake" "doMakeInstall"];
+  buildInputs = [ mesa SDL cmake eigen ];
 
-  setVars = a.noDepEntry ''
-    export EIGENDIR=${a.eigen}/include/eigen2
-  '';
+  preConfigure = ''export EIGENDIR=${eigen}/include/eigen2'';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A physics-based puzzle game";
-    maintainers = with a.lib.maintainers;
+    maintainers = with maintainers;
     [
       raskin
     ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.free;
+    platforms = platforms.linux;
+    license = licenses.free;
     broken = true;
+   downloadPage = "http://sourceforge.net/projects/soi/files/";
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/soi/files/";
-    };
-  };
-}) x
+}