From 42fc03411f4710984eae7dcbd6ec7108d0b8ee72 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 19 Jun 2015 14:20:05 +0200
Subject: [PATCH] drgeo: reimplement using mkDerivation

---
 .../science/geometry/drgeo/default.nix        | 23 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index 63b757945d29..f0be5258ce45 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -1,24 +1,23 @@
-args @ { libxml2, perl, intltool, libtool, pkgconfig, gtk, ... } : with args;
-let version = lib.attrByPath ["version"] "1.1.0" args; in
-rec {
+{ stdenv, fetchurl, libglade, gtk, guile, libxml2, perl
+, intltool, libtool, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "drgeo-${version}";
+  version = "1.1.0";
+
   src = fetchurl {
-    url = mirror://sourceforge/ofset/drgeo-1.1.0.tar.gz;
+    url = "mirror://sourceforge/ofset/${name}.tar.gz";
     sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc";
   };
+  patches = [ ./struct.patch ];
 
   buildInputs = [libglade gtk guile libxml2
     perl intltool libtool pkgconfig];
-  configureFlags = [];
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["doPatch" "doConfigure" "doPreBuild" "doMakeInstall"];
-  patches = [ ./struct.patch ];
-
-  doPreBuild = fullDepEntry (''
+  prebuild = ''
     cp drgeo.desktop.in drgeo.desktop
-  '') ["minInit" "doUnpack"];
+  '';
 
-  name = "drgeo-" + version;
   meta = {
     description = "Interactive geometry program";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20afb6d585d5..679b155ccd5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14610,7 +14610,7 @@ let
 
   ### SCIENCE/GEOMETRY
 
-  drgeo = builderDefsPackage (callPackage ../applications/science/geometry/drgeo) {
+  drgeo = callPackage ../applications/science/geometry/drgeo {
     inherit (gnome) libglade;
     guile = guile_1_8;
   };