mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-21 11:34:13 +00:00
Remove some hackery
This commit is contained in:
parent
5e83e93e97
commit
85d464a031
@ -6,23 +6,15 @@
|
|||||||
, buildInputs ? []
|
, buildInputs ? []
|
||||||
, name ? "source-tarball"
|
, name ? "source-tarball"
|
||||||
, version ? "0"
|
, version ? "0"
|
||||||
, versionSuffix ?
|
, versionSuffix ?
|
||||||
if officialRelease
|
if officialRelease
|
||||||
then ""
|
then ""
|
||||||
else "pre${toString (src.rev or src.revCount or "")}"
|
else "pre${toString (src.rev or src.revCount or "")}"
|
||||||
, src, stdenv, autoconf, automake, libtool
|
, src, stdenv, autoconf, automake, libtool
|
||||||
|
, # By default, provide all the GNU Build System as input.
|
||||||
|
bootstrapBuildInputs ? [ autoconf automake libtool ]
|
||||||
, ... } @ args:
|
, ... } @ 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 (
|
stdenv.mkDerivation (
|
||||||
|
|
||||||
# First, attributes that can be overriden by the caller (via args):
|
# First, attributes that can be overriden by the caller (via args):
|
||||||
@ -82,17 +74,17 @@ stdenv.mkDerivation (
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Then, the caller-supplied attributes.
|
# Then, the caller-supplied attributes.
|
||||||
// args //
|
// args //
|
||||||
|
|
||||||
# And finally, our own stuff.
|
# And finally, our own stuff.
|
||||||
{
|
{
|
||||||
name = name + "-" + version + versionSuffix;
|
name = name + "-" + version + versionSuffix;
|
||||||
|
|
||||||
buildInputs = buildInputs ++ bootstrapBuildInputs;
|
buildInputs = buildInputs ++ bootstrapBuildInputs;
|
||||||
|
|
||||||
preUnpack = ''
|
preUnpack = ''
|
||||||
mkdir -p $out/nix-support
|
mkdir -p $out/nix-support
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
# Set all source files to the current date. This is because Nix
|
# Set all source files to the current date. This is because Nix
|
||||||
|
Loading…
Reference in New Issue
Block a user