Author: rob
Date: Tue May 3 08:04:36 2011
New Revision: 27105
URL: https://svn.nixos.org/websvn/nix/?rev=27105&sc=1
Log:
let cpio use gnu-jobs.nix
Modified:
hydra-config/gnu/trunk/cpio/release.nix
Modified: hydra-config/gnu/trunk/cpio/release.nix
==============================================================================
--- hydra-config/gnu/trunk/cpio/release.nix Tue May 3 07:41:35 2011
(r27104)
+++ hydra-config/gnu/trunk/cpio/release.nix Tue May 3 08:04:36 2011
(r27105)
@@ -15,7 +15,12 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-{nixpkgs ? ../../nixpkgs}:
+{ nixpkgs ? ../../nixpkgs
+, cpioSrc ? {outPath = ../../cpio;}
+, paxutils ? {outPath = ../../paxutils;}
+, gnulib ? {outPath = ../../gnulib;}
+}:
+
let
pkgs = import nixpkgs {};
crossSystems = (import ../cross-systems.nix) { inherit pkgs; };
@@ -43,80 +48,23 @@
maintainers = [ "Sergey Poznyakoff <g...@gnu.org.ua>" ];
};
- buildInputsFrom = pkgs: [];
-
succeedOnFailure = true;
keepBuildDirectory = true;
- jobs = rec {
+in
+ import ../gnu-jobs.nix {
+ name = "cpio";
+ src = cpioSrc;
+ inherit nixpkgs meta;
+ enableGnuCrossBuild = true;
+
+ customEnv = {
+
+ tarball = pkgs: {
+ PAXUTILS_SRCDIR = paxutils;
+ buildInputs = with pkgs; [ git texinfo bison cvs man rsync perl cpio
automake111x xz gettext m4];
+ } ;
- tarball =
- { cpioSrc ? {outPath = ../../cpio;}
- , paxutils ? {outPath = ../../paxutils;}
- , gnulib ? {outPath = ../../gnulib;}
- }:
-
- with pkgs;
-
- pkgs.releaseTools.sourceTarball {
- name = "cpio-tarball";
- src = cpioSrc;
-
- autoconfPhase = ''
- cp -Rv ${gnulib} ../gnulib
- chmod -R 755 ../gnulib
- cp -Rv ${paxutils} ../paxutils
- chmod -R 755 ../paxutils
-
- ./bootstrap --gnulib-srcdir=../gnulib --paxutils-srcdir=../paxutils
--skip-po --copy
- '';
-
- buildInputs = [
- git
- gettext_0_17
- cvs
- texinfo
- man
- rsync
- gnum4
- bison
- automake111x
- ] ++ buildInputsFrom pkgs;
-
- inherit meta succeedOnFailure keepBuildDirectory;
- };
-
- build =
- { tarball ? jobs.tarball {}
- , system ? "x86_64-linux"
- }:
-
- let pkgs = import nixpkgs {inherit system;};
- in with pkgs;
- releaseTools.nixBuild {
- name = "cpio" ;
- src = tarball;
- buildInputs = buildInputsFrom pkgs;
- inherit meta succeedOnFailure keepBuildDirectory;
- };
-
- xbuild_gnu =
- # Cross build to GNU.
- { tarball ? jobs.tarball {}
- }:
-
- let pkgs = import nixpkgs {
- crossSystem = crossSystems.i586_pc_gnu;
- };
- in
- (pkgs.releaseTools.nixBuild {
- name = "cpio" ;
- src = tarball;
- buildInputs = buildInputsFrom pkgs;
- doCheck = false;
- inherit meta succeedOnFailure keepBuildDirectory;
- }).hostDrv;
-
- };
+ };
+}
-in jobs
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
