From 5fb868033fd8620eb6339df33fac00df21027790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 13 Dec 2012 00:28:51 +0100
Subject: [PATCH] release.nix: Build the daemon.
* release.nix (tarball): Add `preAutoconf'. Augment `buildInputs' and
`configureFlags' to allow daemon builds.
(build): Likewise.
---
release.nix | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/release.nix b/release.nix
index 1b913b497b7..fecbfb69d74 100644
--- a/release.nix
+++ b/release.nix
@@ -48,11 +48,12 @@ let
pkgs.releaseTools.sourceTarball {
name = "guix-tarball";
src = <guix>;
- buildInputs = with pkgs; [ guile ];
+ buildInputs = with pkgs; [ guile sqlite bzip2 git libgcrypt ];
buildNativeInputs = with pkgs; [ texinfo gettext cvs pkgconfig ];
+ preAutoconf = ''git config submodule.gnulib.url "${<gnulib>}"'';
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
pkgs.releaseTools.nixBuild {
name = "guix";
- buildInputs = [ pkgs.guile ];
+ buildInputs = with pkgs; [ guile sqlite bzip2 libgcrypt ];
buildNativeInputs = [ pkgs.pkgconfig ];
src = jobs.tarball;
configureFlags =
- [ "--with-nix-prefix=${pkgs.nix}"
- "--with-libgcrypt-prefix=${pkgs.libgcrypt}"
+ [ "--with-libgcrypt-prefix=${pkgs.libgcrypt}"
+ "--localstatedir=/nix/var/nix"
];
preBuild =
--
GitLab