guix_mirror_bot pushed a commit to branch emacs-team
in repository guix.

commit 7e00f9b31b0d83515f27f67ed0a0316a418416aa
Author: Nicolas Graves <[email protected]>
AuthorDate: Mon Jul 14 15:00:13 2025 +0200

    gnu: emacs: Build reproducibly on x86_64.
    
    * gnu/packages/emacs.scm (emacs-minimal)[arguments]
      <#:make-flags>: Wrap RUN_TEMACS with dettrace on x86_64.
      <#:parallel-build?>: Set to #f on x86_64.
      [native-inputs]: Add dettrace on x86_64.
    
    Signed-off-by: Liliana Marie Prikler <[email protected]>
---
 gnu/packages/emacs.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 107ef050a6..812cdce879 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -196,7 +196,18 @@
      (list
       #:modules (%emacs-modules build-system)
       #:configure-flags #~(list "--with-gnutls=no" "--disable-build-details")
-      #:make-flags #~(list (string-append "SELECTOR=" #$%selector))
+      #:make-flags
+      #~(list (string-append "SELECTOR=" #$%selector)
+              ;; XXX: Used to make emacs pdump reproducible, but only on 
x86_64.
+              #$@(if (supported-package? dettrace)
+                     #~((string-append "RUN_TEMACS="
+                                       #$(this-package-native-input "dettrace")
+                                       "/bin/dettrace"
+                                       " --host-userns --host-pidns "
+                                       " --host-mountns --base-env=host"
+                                       " -- ./temacs"))
+                     #~()))
+      #:parallel-build? (not (supported-package? dettrace))
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'enable-elogind
@@ -358,7 +369,10 @@
                  (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$"))
                  "bin/emacs")))))))
     (inputs (list bash-minimal coreutils findutils gawk gzip ncurses sed))
-    (native-inputs (list autoconf pkg-config texinfo))
+    (native-inputs (append (list autoconf pkg-config texinfo)
+                           (if (supported-package? dettrace)
+                               (list dettrace)
+                               '())))
     (home-page "https://www.gnu.org/software/emacs/";)
     (synopsis "The extensible text editor (minimal build for 
byte-compilation)")
     (description

Reply via email to