From d0691bf1d7789c9f8e90016d9995fbc2122a43e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 6 Mar 2009 16:53:44 +0000
Subject: [PATCH] * We don't need all that src.outPath / src.path hackery
 anymore.

svn path=/nixpkgs/trunk/; revision=14419
---
 pkgs/build-support/release/debian-build.nix        | 2 --
 pkgs/build-support/release/make-source-tarball.nix | 3 +--
 pkgs/build-support/release/nix-build.nix           | 2 --
 pkgs/build-support/release/rpm-build.nix           | 2 --
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 85f6a73cda3..d41750733b5 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -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
diff --git a/pkgs/build-support/release/make-source-tarball.nix b/pkgs/build-support/release/make-source-tarball.nix
index ccae6d612ab..2e40ad2d623 100644
--- a/pkgs/build-support/release/make-source-tarball.nix
+++ b/pkgs/build-support/release/make-source-tarball.nix
@@ -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"
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 0359828efeb..f9d2351d925 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -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
diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix
index d2d8ea65c22..97e86dd3c68 100644
--- a/pkgs/build-support/release/rpm-build.nix
+++ b/pkgs/build-support/release/rpm-build.nix
@@ -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