Author: rob
Date: Wed Mar 2 10:24:18 2011
New Revision: 26129
URL: https://svn.nixos.org/websvn/nix/?rev=26129&sc=1
Log:
added useLatestGnulib option to allow jobsets to override behaviour default
behaviour of using latest gnulib
Modified:
hydra-config/gnu/trunk/gnu-jobs.nix
Modified: hydra-config/gnu/trunk/gnu-jobs.nix
==============================================================================
--- hydra-config/gnu/trunk/gnu-jobs.nix Tue Mar 1 13:14:23 2011 (r26128)
+++ hydra-config/gnu/trunk/gnu-jobs.nix Wed Mar 2 10:24:18 2011 (r26129)
@@ -21,6 +21,7 @@
, customJobs ? pkgs: {}
, nixpkgs
, enableGnuCrossBuild ? false
+, useLatestGnulib ? true
}:
let
@@ -30,16 +31,13 @@
succeedOnFailure = true;
keepBuildDirectory = true;
- jobs = (rec {
- tarball =
- { gnulib ? {outPath = ../gnulib;}
- }:
+ tarballFun = gnulib :
pkgs.releaseTools.makeSourceTarball ({
name = "${name}-tarball";
inherit src meta succeedOnFailure keepBuildDirectory;
prePhases = "setupGnulib";
- setupGnulib = ''
+ setupGnulib = pkgs.lib.optionalString useLatestGnulib ''
export GNULIB_SRCDIR=../gnulib
mkdir -p gnulib
@@ -48,10 +46,14 @@
'';
autoconfPhase = ''
- ./bootstrap --gnulib-srcdir=../gnulib --skip-po --copy
+ ./bootstrap ${pkgs.lib.optionalString useLatestGnulib
"--gnulib-srcdir=../gnulib"} --skip-po --copy
'';
} // ( pkgs.lib.optionalAttrs (customEnv ? tarball) (customEnv.tarball
pkgs) ) );
+ jobs = (rec {
+ tarball =
+ if useLatestGnulib then { gnulib ? {outPath = ../gnulib;} }: tarballFun
gnulib else tarballFun null;
+
build =
{ system ? "x86_64-linux"
, tarball ? jobs.tarball {}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
