From 834ebdea4b86b725a4b127b6b1db0b658328aa11 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 30 Sep 2010 15:02:42 +0000 Subject: [PATCH] hydra: fix tarball build, add pre suffix to tarballs --- configure.ac | 2 +- release.nix | 10 ++++++++-- version | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 version diff --git a/configure.ac b/configure.ac index 25b6d291..15df6e01 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([hydra],[0.1],[rob.vermaas@gmail.com]) +AC_INIT([hydra],[m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX])]) AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC diff --git a/release.nix b/release.nix index ed15f22f..568ba337 100644 --- a/release.nix +++ b/release.nix @@ -11,10 +11,15 @@ rec { releaseTools.makeSourceTarball { name = "hydra-tarball"; - version = "0.1"; src = hydraSrc; inherit officialRelease; + buildInputs = [ perl libxslt dblatex tetex ] ; + + preConfigure = '' + # TeX needs a writable font cache. + export VARTEXFONTS=$TMPDIR/texfonts + ''; }; build = @@ -32,7 +37,7 @@ rec { configureFlags = "--with-nix=${nix}"; buildInputs = - [ perl makeWrapper libtool dblatex nix unzip ] + [ perl makeWrapper libtool nix unzip nukeReferences ] ++ (import ./deps.nix) { inherit pkgs; }; hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ @@ -43,6 +48,7 @@ rec { postInstall = '' 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 diff --git a/version b/version new file mode 100644 index 00000000..ceab6e11 --- /dev/null +++ b/version @@ -0,0 +1 @@ +0.1 \ No newline at end of file