gnokii: use mkDerivation

pkgs/tools/misc/gnokii/default.nix

@@ -1,31 +1,25 @@
-a @ { intltool, perl, gettext, libusb, pkgconfig, bluez, readline, pcsclite, libical, gtk, glib, libXpm, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez
+, readline, pcsclite, libical, gtk, glib, libXpm }:
 
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
+stdenv.mkDerivation rec {
+  name = "gnokii-${version}";
+  version = "0.6.31";
+
+  src = fetchurl {
+    sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
+    url = "http://www.gnokii.org/download/gnokii/${name}.tar.gz";
+  };
+
+  buildInputs = [
     perl intltool gettext libusb
     glib gtk pkgconfig bluez readline
     libXpm pcsclite libical
   ];
-in
 
-assert a.stdenv ? glibc;
-
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = [ "doConfigure" "doMakeInstall"];
-
-  inherit(s) name;
   meta = {
     description = "Cellphone tool";
     homepage = http://www.gnokii.org;
-    maintainers = [a.lib.maintainers.raskin];
-    platforms = with a.lib.platforms; linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/misc/gnokii/src-for-default.nix

@@ -1,9 +0,0 @@
-rec {
-   version="0.6.31";
-   name="gnokii-0.6.31";
-   hash="0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
-   url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz";
-   advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.gz";
-  
-  
-}

pkgs/tools/misc/gnokii/src-info-for-default.nix

@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://www.gnokii.org/download/gnokii/?C=M;O=D";
-  baseName = "gnokii";
-}

pkgs/top-level/all-packages.nix

@@ -1662,7 +1662,7 @@ let
 
   gnaural = callPackage ../applications/audio/gnaural { };
 
-  gnokii = builderDefsPackage (callPackage ../tools/misc/gnokii) { };
+  gnokii = callPackage ../tools/misc/gnokii { };
 
   gnuapl = callPackage ../development/interpreters/gnu-apl { };