* Set VERSION_SUFFIX to -pre<revision> unless building an "official"

  release.
* Use @-patterns and `...' instead of using a "with".

svn path=/nixpkgs/trunk/; revision=13413

1 files changed, 16 insertions, 14 deletions

diff --git a/pkgs/build-support/release/make-source-tarball.nix b/pkgs/build-support/release/make-source-tarball.nix
index b8cf88f517c..0659bb7fb5c 100644
--- a/pkgs/build-support/release/make-source-tarball.nix
+++ b/pkgs/build-support/release/make-source-tarball.nix
@@ -2,7 +2,19 @@
 # checkout from a Subversion or CVS repository) into a source tarball
 # by running `autoreconf', `configure' and `make dist'.
 
-args: with args;
+{ officialRelease ? false
+, buildInputs ? []
+, src, stdenv, autoconf, automake, libtool
+, ...} @ args:
+
+let
+
+  versionSuffix =
+    if officialRelease
+    then ""
+    else if src ? rev then "-pre${toString src.rev}" else "";
+
+in
 
 stdenv.mkDerivation (
 
@@ -32,9 +44,7 @@ stdenv.mkDerivation (
   {
     src = src.path;
 
-    buildInputs =
-      stdenv.lib.optionals (args ? buildInputs) args.buildInputs ++
-      [autoconf automake];
+    buildInputs = buildInputs ++ [autoconf automake];
     
     postHook = ''
       ensureDir $out/nix-support
@@ -53,18 +63,10 @@ stdenv.mkDerivation (
 
     nextPostUnpack = if args ? postUnpack then args.postUnpack else "";
 
-    preConfigure = ''
-      # Some packages1 use the file `svn-revision' to construct the
-      # release name.
-      rev="${if src ? rev then toString src.rev else ""}"
-      if test -n "$rev"; then echo "$rev" > svn-revision; fi
-      eval "$nextPreConfigure"
-    '';
-
-    nextPreConfigure = if args ? preConfigure then args.preConfigure else "";
-
     # Autoconfiscate the sources.
     autoconfPhase = ''
+      export VERSION_SUFFIX=${versionSuffix}
+    
       eval "$preAutoconf"
     
       if test -f ./bootstrap; then ./bootstrap