Author: ludo
Date: Wed Mar 2 17:26:16 2011
New Revision: 26136
URL: https://svn.nixos.org/websvn/nix/?rev=26136&sc=1
Log:
gnu-jobs: Remove `setupGnulib' from `prePhases' when !useLatestGnulib.
Modified:
hydra-config/gnu/trunk/gnu-jobs.nix
Modified: hydra-config/gnu/trunk/gnu-jobs.nix
==============================================================================
--- hydra-config/gnu/trunk/gnu-jobs.nix Wed Mar 2 17:18:30 2011 (r26135)
+++ hydra-config/gnu/trunk/gnu-jobs.nix Wed Mar 2 17:26:16 2011 (r26136)
@@ -36,19 +36,21 @@
name = "${name}-tarball";
inherit src meta succeedOnFailure keepBuildDirectory;
- prePhases = "setupGnulib";
- setupGnulib = pkgs.lib.optionalString useLatestGnulib ''
- export GNULIB_SRCDIR=../gnulib
-
- mkdir -p gnulib
- cp -Rv "${gnulib}/"* gnulib
- chmod -R 755 gnulib
- '';
-
autoconfPhase = ''
./bootstrap ${pkgs.lib.optionalString useLatestGnulib
"--gnulib-srcdir=../gnulib"} --skip-po --copy
'';
- } // ( pkgs.lib.optionalAttrs (customEnv ? tarball) (customEnv.tarball
pkgs) ) );
+ }
+ // ( pkgs.lib.optionalAttrs useLatestGnulib {
+ prePhases = "setupGnulib";
+ setupGnulib = ''
+ export GNULIB_SRCDIR=../gnulib
+
+ mkdir -p gnulib
+ cp -Rv "${gnulib}/"* gnulib
+ chmod -R 755 gnulib
+ '';
+ })
+ // ( pkgs.lib.optionalAttrs (customEnv ? tarball) (customEnv.tarball
pkgs) ) );
jobs = (rec {
tarball =
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
