diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-06 16:57:57 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-06 16:57:57 +0100 |
commit | 85d464a031c6ac79eb565bdfb49a496dbda9c0c8 (patch) | |
tree | bb83d951a1802a92384909e20701841c05746ecf /pkgs/build-support/release/source-tarball.nix | |
parent | 5e83e93e97625bdeac8cbeb965b4d60aa2bf2558 (diff) | |
download | nixpkgs-85d464a031c6ac79eb565bdfb49a496dbda9c0c8.tar nixpkgs-85d464a031c6ac79eb565bdfb49a496dbda9c0c8.tar.gz nixpkgs-85d464a031c6ac79eb565bdfb49a496dbda9c0c8.tar.bz2 nixpkgs-85d464a031c6ac79eb565bdfb49a496dbda9c0c8.tar.lz nixpkgs-85d464a031c6ac79eb565bdfb49a496dbda9c0c8.tar.xz nixpkgs-85d464a031c6ac79eb565bdfb49a496dbda9c0c8.tar.zst nixpkgs-85d464a031c6ac79eb565bdfb49a496dbda9c0c8.zip |
Remove some hackery
Diffstat (limited to 'pkgs/build-support/release/source-tarball.nix')
-rw-r--r-- | pkgs/build-support/release/source-tarball.nix | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 5ba1356a17f..b50077975c1 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -6,23 +6,15 @@ , buildInputs ? [] , name ? "source-tarball" , version ? "0" -, versionSuffix ? +, versionSuffix ? if officialRelease then "" else "pre${toString (src.rev or src.revCount or "")}" , src, stdenv, autoconf, automake, libtool +, # By default, provide all the GNU Build System as input. + bootstrapBuildInputs ? [ autoconf automake libtool ] , ... } @ args: -let - - # By default, provide all the GNU Build System as input. - bootstrapBuildInputs = - if (args ? bootstrapBuildInputs) - then args.bootstrapBuildInputs - else [ autoconf automake libtool ]; - -in - stdenv.mkDerivation ( # First, attributes that can be overriden by the caller (via args): @@ -82,17 +74,17 @@ stdenv.mkDerivation ( } # Then, the caller-supplied attributes. - // args // + // args // # And finally, our own stuff. { name = name + "-" + version + versionSuffix; buildInputs = buildInputs ++ bootstrapBuildInputs; - + preUnpack = '' mkdir -p $out/nix-support - ''; + ''; postUnpack = '' # Set all source files to the current date. This is because Nix |