From a1e397c4fbc7a5c47077d1f386f7bb8bed3ac205 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 16 Jun 2015 20:51:57 +0200
Subject: [PATCH] ode: reimplement using mkDerivation

---
 pkgs/development/libraries/ode/default.nix | 22 +++++-----------------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index 7c9c9304f77..e7d2f2984fb 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -1,26 +1,14 @@
-args :  
-let 
-  lib = args.lib;
-  fetchurl = args.fetchurl;
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "ode-${version}";
+  version = "0.12";
 
-  version = lib.attrByPath ["version"] "0.12" args;
-  buildInputs = with args; [
-    
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://sourceforge/opende/ode-${version}.tar.bz2";
     sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "ode-" + version;
   meta = {
     description = "Open Dynamics Engine";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 565b91f93de..cf920f7e64d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7881,7 +7881,7 @@ let
 
   nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };
 
-  ode = builderDefsPackage (callPackage ../development/libraries/ode) { };
+  ode = callPackage ../development/libraries/ode { };
 
   ogre = callPackage ../development/libraries/ogre {};