summaryrefslogtreecommitdiff
path: root/gnu/packages/cinnamon.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-12-03 19:15:17 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-12-03 19:15:17 +0100
commit99f63f011df2aab38e98d7ee4608a8c70bf74c4d (patch)
tree3f224028f30c60f2ed7b9846365ad926192fc7e9 /gnu/packages/cinnamon.scm
parente9a8b603337802a77ff2d68f0d30dc0e67721e3a (diff)
parent4f03aa23e805bd653de774e1d74ed2f50826899b (diff)
downloadpatches-99f63f011df2aab38e98d7ee4608a8c70bf74c4d.tar
patches-99f63f011df2aab38e98d7ee4608a8c70bf74c4d.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/cinnamon.scm')
-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)