02/02: gnu: icedtea-8: Do not embed build time.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 0c729ef4e361f2fe396a44bd138a693324abfc4a
Author: Ricardo Wurmus <address@hidden>
Date:   Thu Mar 2 12:38:21 2017 +0100

    gnu: icedtea-8: Do not embed build time.
    
    * gnu/packages/java.scm (icedtea-8)[source]: Modify snippet to erase the
    embedded build time.
---
 gnu/packages/java.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index cf4ba69..1ff106c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016 Leo Famulari <address@hidden>
 ;;; Copyright © 2016, 2017 Roel Janssen <address@hidden>
 ;;; Copyright © 2017 Carlo Zancanaro <address@hidden>
@@ -855,10 +855,15 @@ IcedTea build harness.")
                   "02vmxa6gc6gizcri1fy797qmmm9y77vgi7gy9pwkk4agcw4zyr5p"))
                 (modules '((guix build utils)))
                 (snippet
-                 '(substitute* "Makefile.am"
-                    ;; do not leak information about the build host
-                    (("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"")
-                     "DISTRIBUTION_ID=\"\\\"guix\\\"\"")))))
+                 '(begin
+                    (substitute* "acinclude.m4"
+                      ;; Do not embed build time
+                      (("(DIST_ID=\"Custom build).*$" _ prefix)
+                       (string-append prefix "\"\n"))
+                      ;; Do not leak information about the build host
+                      (("DIST_NAME=\"\\$build_os\"")
+                       "DIST_NAME=\"guix\""))
+                    #t))))
       (arguments
        (substitute-keyword-arguments (package-arguments icedtea-7)
          ((#:configure-flags flags)