From f6fcbf9245c854c67eae3444edc79c7682c7816b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Nov 2008 23:44:17 +0000 Subject: [PATCH] * Include nix-prefetch-svn in the Hydra binary distribution. * Be very strict about $PATH so that we don't get surprises about missing programs. --- release.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/release.nix b/release.nix index 50ae6506..e104b6bd 100644 --- a/release.nix +++ b/release.nix @@ -73,20 +73,30 @@ let src=$(ls ${tarball.path}/tarballs/*.tar.bz2) ''; # */ + hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") [ + libxslt sqlite subversion nixUnstable coreutils + gzip bzip2 gnused + ]); + installPhase = '' ensureDir $out/libexec cp -prd src/Hydra $out/libexec/hydra - mv $out/libexec/hydra/script $out/bin + cp ${nixpkgs.path + "/pkgs/build-support/fetchsvn/nix-prefetch-svn"} $out/bin/nix-prefetch-svn + for i in $out/bin/*; do wrapProgram $i \ --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ - --prefix PATH ':' $out/bin:${libxslt}/bin:${sqlite}/bin \ + --set PATH $out/bin:$hydraPath \ --set HYDRA_HOME $out/libexec/hydra done ''; # */ + + meta = { + description = "Build of Hydra on ${system}"; + }; }; };