diff options
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/release/debian-build.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/release/make-source-tarball.nix | 3 | ||||
-rw-r--r-- | pkgs/build-support/release/nix-build.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/release/rpm-build.nix | 2 |
4 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 85f6a73cda391..d41750733b5d7 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 ccae6d612ab19..2e40ad2d6231f 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 0359828efeb5d..f9d2351d92531 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 d2d8ea65c2219..97e86dd3c68a6 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 |