* We don't need all that src.outPath / src.path hackery anymore.

svn path=/nixpkgs/trunk/; revision=14419
This commit is contained in:
Eelco Dolstra 2009-03-06 16:53:44 +00:00
parent bd5aed6fd6
commit d0691bf1d7
4 changed files with 1 additions and 8 deletions

View file

@ -21,8 +21,6 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
{
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
src = if src ? outPath then src.outPath else src.path;
# !!! cut&paste from rpm-build.nix
postHook = ''
ensureDir $out/nix-support

View file

@ -45,8 +45,6 @@ stdenv.mkDerivation (
{
name = name + "-" + version + versionSuffix;
src = src.path;
buildInputs = buildInputs ++ [autoconf automake libtool];
postHook = ''
@ -68,6 +66,7 @@ stdenv.mkDerivation (
# Autoconfiscate the sources.
autoconfPhase = ''
export VERSION=${version}
export VERSION_SUFFIX=${versionSuffix}
eval "$preAutoconf"

View file

@ -31,8 +31,6 @@ stdenv.mkDerivation (
{
name = name + (if src ? version then "-" + src.version else "");
src = if src ? outPath then src.outPath else src.path;
postHook = ''
ensureDir $out/nix-support
echo "$system" > $out/nix-support/system

View file

@ -13,8 +13,6 @@ vmTools.buildRPM (
{
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
src = if src ? outPath then src.outPath else src.path;
preBuild = ''
ensureDir $out/nix-support
cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name