From 2892c925697246fbdf05f3e483c3078aa6c616ee Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 14 Jan 2011 14:04:46 +0000 Subject: [PATCH] move nix-prefetch-* into tarball --- release.nix | 8 ++++---- src/script/Makefile.am | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/release.nix b/release.nix index 90fc33ea..1498a778 100644 --- a/release.nix +++ b/release.nix @@ -21,6 +21,10 @@ rec { preConfigure = '' # TeX needs a writable font cache. export VARTEXFONTS=$TMPDIR/texfonts + + cp ${"${nixpkgs}/pkgs/build-support/fetchsvn/nix-prefetch-svn"} src/script + cp ${"${nixpkgs}/pkgs/build-support/fetchgit/nix-prefetch-git"} src/script + cp ${"${nixpkgs}/pkgs/build-support/fetchhg/nix-prefetch-hg"} src/script ''; configureFlags = "--with-nix=${nix}"; @@ -59,10 +63,6 @@ rec { ensureDir $out/nix-support nuke-refs $out/share/doc/hydra/manual/manual.pdf - cp ${"${nixpkgs}/pkgs/build-support/fetchsvn/nix-prefetch-svn"} $out/bin/nix-prefetch-svn - cp ${"${nixpkgs}/pkgs/build-support/fetchgit/nix-prefetch-git"} $out/bin/nix-prefetch-git - cp ${"${nixpkgs}/pkgs/build-support/fetchhg/nix-prefetch-hg"} $out/bin/nix-prefetch-hg - for i in $out/bin/*; do wrapProgram $i \ --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ diff --git a/src/script/Makefile.am b/src/script/Makefile.am index c1fd2785..15d7478a 100644 --- a/src/script/Makefile.am +++ b/src/script/Makefile.am @@ -6,4 +6,7 @@ bin_SCRIPTS = \ hydra_server.pl \ hydra_update_gc_roots.pl \ hydra_create.pl \ + nix-prefetch-svn \ + nix-prefetch-git \ + nix-prefetch-hg \ hydra_control.sh