[PATCH 1/2] daemon: Fix '--version'.

[Alex Vong <alexvong1995@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

Hi guixes,

This one and the next patch fix '--version' of guix-daemon and
guix-register. Currently, they are not working, which is the reason why
help2man gives error when building from source.


[-- Attachment #2: 0001-daemon-Fix-version.patch --]
[-- Type: text/x-diff, Size: 1602 bytes --]

From 06d97b6de29aedeec7efe6f9a1e654145183a06b Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1995@gmail.com>
Date: Wed, 24 Aug 2016 08:25:48 +0800
Subject: [PATCH 1/2] daemon: Fix '--version'.

* nix/nix-daemon/guix-daemon.cc (argp_program_version): Assigning
  instead of declaring.
  (argp_program_bug_address): Likewise.
---
 nix/nix-daemon/guix-daemon.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index d5d33a5..41b56cb 100644
--- a/nix/nix-daemon/guix-daemon.cc
+++ b/nix/nix-daemon/guix-daemon.cc
@@ -1,5 +1,6 @@
 /* GNU Guix --- Functional package management for GNU
    Copyright (C) 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+   Copyright (C) 2016 Alex Vong <alexvong1995@gmail.com>
 
    This file is part of GNU Guix.
 
@@ -53,10 +54,6 @@ extern void run (Strings args);
 static const char guix_textdomain[] = "guix";
 
 
-const char *argp_program_version =
-  "guix-daemon (" PACKAGE_NAME ") " PACKAGE_VERSION;
-const char *argp_program_bug_address = PACKAGE_BUGREPORT;
-
 static char doc[] =
   n_("guix-daemon -- perform derivation builds and store accesses")
   "\v\n"
@@ -344,6 +341,8 @@ main (int argc, char *argv[])
       settings.useBuildHook = false;
 #endif
 
+      argp_program_version = "guix-daemon (" PACKAGE_NAME ") " PACKAGE_VERSION;
+      argp_program_bug_address = PACKAGE_BUGREPORT;
       argp_parse (&argp, argc, argv, 0, 0, 0);
 
       /* Effect all the changes made via 'settings.set'.  */
-- 
2.9.3