summary refs log tree commit diff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-09-17 13:51:12 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2018-09-18 13:49:23 +0200
commitb22c44f1ea7a06fefdbe80b579f1c9a1bad2213f (patch)
tree17d053a3dd9ce71a165506792ab1c857fc9138be
parent0edc232be92d62cd67b38192ee6d959ee30f599f (diff)
downloadguix-b22c44f1ea7a06fefdbe80b579f1c9a1bad2213f.tar.gz
gnu: cinnamon-desktop: Use Guix's built-in bootstrap phase.
* gnu/packages/cinnamon.scm (cinnamon-desktop)[arguments]: Remove
'autoconf' phase. Add 'skip-premature-configure' phase.
-rw-r--r--gnu/packages/cinnamon.scm10
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm
index 65aea47d5a..7cac863f92 100644
--- a/gnu/packages/cinnamon.scm
+++ b/gnu/packages/cinnamon.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -50,13 +51,10 @@
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'autoconf
+         (add-before 'bootstrap 'skip-premature-configure
            (lambda _
-             (mkdir-p "m4")
-             (zero?
-              (and (system* "glib-gettextize" "--force" "--copy")
-                   (system* "intltoolize" "--force" "--copy" "--automake")
-                   (system* "autoreconf" "--verbose" "--force" "--install"))))))))
+             (setenv "NOCONFIGURE" "set")
+             #t)))))
     ;; TODO: package 'libgsystem'.
     (inputs
      `(("accountsservice" ,accountsservice)