diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-11-25 15:53:45 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-11-25 15:53:45 +0000 |
commit | 2efa4abeaeb35b54aae00ddcf04cb83363f5193b (patch) | |
tree | 6f655fc870cd712f763d370d58e5a7c845d3dea9 /pkgs/build-support/release | |
parent | 75ed8f2e20a1235c5ed2721fe66c660175302f15 (diff) |
* 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
Diffstat (limited to 'pkgs/build-support/release')
-rw-r--r-- | pkgs/build-support/release/make-source-tarball.nix | 30 |
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 b8cf88f517c86..0659bb7fb5c0b 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 |