From 8b3c02c14ce0fd3d298cf8e6cbee259247f9f1e4 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 26 Apr 2015 17:04:05 +0200
Subject: [PATCH] bmrsa: reimplement using mkDerivation

Also set homepage & license (GPL according to the README,
no license is actually included in the source repo).
---
 pkgs/tools/security/bmrsa/11.nix | 36 ++++++++++++--------------------
 pkgs/top-level/all-packages.nix  |  2 +-
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index 745f2a04cd3..343d48f91d7 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -1,38 +1,28 @@
-args @ {unzip, ... } :
-let
-  lib = args.lib;
-  fetchurl = args.fetchurl;
-  fullDepEntry = args.fullDepEntry;
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "bmrsa-${version}";
+  version = "11";
 
-  version = "11"; 
-  buildInputs = with args; [
-    unzip
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://sourceforge/bmrsa/bmrsa${version}.zip";
     sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ unzip ];
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["doMakeInstall"];
-
-  doUnpack = fullDepEntry (''
+  unpackPhase = ''
     mkdir bmrsa
-    cd bmrsa 
+    cd bmrsa
     unzip ${src}
     sed -e 's/gcc/g++/' -i Makefile
     mkdir -p $out/bin
     echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile
-  '') ["minInit" "addInputs" "defEnsureDir"];
-      
-  name = "bmrsa-"+version;
-  meta = {
+  '';
+
+  meta = with stdenv.lib; {
     description = "RSA utility";
+    homepage = http://bmrsa.sourceforge.net/;
+    license = licenses.gpl1;
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7b72ca5b0e..0cbf0e104a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -974,7 +974,7 @@ let
     inherit (pythonPackages) notify;
   };
 
-  bmrsa = builderDefsPackage (callPackage ../tools/security/bmrsa/11.nix) { };
+  bmrsa = callPackage ../tools/security/bmrsa/11.nix { };
 
   bogofilter = callPackage ../tools/misc/bogofilter { };