This commit is contained in:
Eelco Dolstra 2009-03-06 10:35:27 +00:00
parent fa9df4e2d4
commit 11360c7aa8

View file

@ -14,6 +14,7 @@ let
releaseTools.makeSourceTarball { releaseTools.makeSourceTarball {
name = "hydra-tarball"; name = "hydra-tarball";
version = "0.1";
src = hydraSrc; src = hydraSrc;
inherit officialRelease; inherit officialRelease;
@ -47,7 +48,7 @@ let
build = build =
{ tarball ? {path = jobs.tarball {};} { tarball ? jobs.tarball {}
, nixpkgs ? {path = ../nixpkgs;} , nixpkgs ? {path = ../nixpkgs;}
, system ? "i686-linux" , system ? "i686-linux"
}: }:
@ -55,7 +56,7 @@ let
with import nixpkgs.path {inherit system;}; with import nixpkgs.path {inherit system;};
stdenvNew.mkDerivation { stdenvNew.mkDerivation {
name = "hydra-build"; name = "hydra" + (if tarball ? version then "-" + tarball.version else "");
buildInputs = [ buildInputs = [
perl makeWrapper perl makeWrapper
@ -72,7 +73,7 @@ let
]; ];
preUnpack = '' preUnpack = ''
src=$(ls ${tarball.path}/tarballs/*.tar.bz2) src=$(ls ${tarball}/tarballs/*.tar.bz2)
''; # */ ''; # */
hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") [ hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") [