nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

release.nix: Build the daemon. 

* release.nix (tarball): Add `preAutoconf'.  Augment `buildInputs' and
  `configureFlags' to allow daemon builds.
  (build): Likewise.
This commit is contained in:
Ludovic Courtès 2012-12-13 00:28:51 +01:00
parent c9b70836d0
commit 5fb868033f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
release.nix
View File

@ -48,11 +48,12 @@ let
pkgs.releaseTools.sourceTarball { pkgs.releaseTools.sourceTarball {
name = "guix-tarball"; name = "guix-tarball";
src = <guix>; src = <guix>;
buildInputs = with pkgs; [ guile ]; buildInputs = with pkgs; [ guile sqlite bzip2 git libgcrypt ];
buildNativeInputs = with pkgs; [ texinfo gettext cvs pkgconfig ]; buildNativeInputs = with pkgs; [ texinfo gettext cvs pkgconfig ];
preAutoconf = ''git config submodule.gnulib.url "${<gnulib>}"'';
configureFlags = configureFlags =
[ "--with-nix-prefix=${pkgs.nix}" [ "--with-libgcrypt-prefix=${pkgs.libgcrypt}"
"--with-libgcrypt-prefix=${pkgs.libgcrypt}" "--localstatedir=/nix/var/nix"
]; ];
}; };
@ -62,12 +63,12 @@ let
let pkgs = import nixpkgs { inherit system; }; in let pkgs = import nixpkgs { inherit system; }; in
pkgs.releaseTools.nixBuild { pkgs.releaseTools.nixBuild {
name = "guix"; name = "guix";
buildInputs = [ pkgs.guile ]; buildInputs = with pkgs; [ guile sqlite bzip2 libgcrypt ];
buildNativeInputs = [ pkgs.pkgconfig ]; buildNativeInputs = [ pkgs.pkgconfig ];
src = jobs.tarball; src = jobs.tarball;
configureFlags = configureFlags =
[ "--with-nix-prefix=${pkgs.nix}" [ "--with-libgcrypt-prefix=${pkgs.libgcrypt}"
"--with-libgcrypt-prefix=${pkgs.libgcrypt}" "--localstatedir=/nix/var/nix"
]; ];
preBuild = preBuild =