From fbea8a558a44cce4db3f5bd1b4758b5bfe4bd875 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 26 Aug 2009 11:13:36 +0000
Subject: Adding WebDruid log analyzer. In the same time, reworking source
 autoupdate system a bit

svn path=/nixpkgs/trunk/; revision=16859
---
 pkgs/build-support/builder-defs/builder-defs.nix     |  5 +++++
 pkgs/build-support/builder-defs/template-bdp-uud.nix | 12 +++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'pkgs/build-support/builder-defs')

diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index 94d3ea8265cd..e4bf4c148c4f 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -521,4 +521,9 @@ let inherit (builtins) head tail trace; in
      ensureDir $(toPythonPath $out)
      export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out)
    '') ["minInit" "addInputs" "defEnsureDir"];
+
+   fetchUrlFromSrcInfo = srcInfo: fetchurl {
+     url = srcInfo.url;
+     sha256 = srcInfo.hash;
+   };
 }) // args
diff --git a/pkgs/build-support/builder-defs/template-bdp-uud.nix b/pkgs/build-support/builder-defs/template-bdp-uud.nix
index 46d2da40a703..a84239f62d57 100644
--- a/pkgs/build-support/builder-defs/template-bdp-uud.nix
+++ b/pkgs/build-support/builder-defs/template-bdp-uud.nix
@@ -1,26 +1,20 @@
 a :  
 let 
-  fetchurl = a.fetchurl;
-  s = import ./src-info-for-default.nix;
-
-  version = a.lib.attrByPath ["version"] s.version a; 
+  s = import ./src-for-default.nix;
   buildInputs = with a; [
     
   ];
 in
 rec {
-  src = fetchurl {
-    url = s.url;
-    sha256 = s.hash;
-  };
+  src = a.fetchUrlFromSrcInfo s;
 
+  inherit (s) name;
   inherit buildInputs;
   configureFlags = [];
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall"];
       
-  name = "${abort "Specify name"}-" + version;
   meta = {
     description = "${abort "Specify description"}";
     maintainers = [
-- 
cgit 1.4.1