mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-16 03:50:45 +02:00
Merge branch 'master' into staging
This commit is contained in:
commit
7097e98586
180 changed files with 7908 additions and 3336 deletions
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013-2017, 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
|
||||
|
@ -465,10 +465,8 @@ editor (with wide ints)" )
|
|||
(base32
|
||||
"0lvcvsz0f4mawj04db35p1dvkffdqkz8pkhc0jzh9j9x2i63kcz6"))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("guile" ,guile-for-guile-emacs)
|
||||
,@(package-native-inputs emacs)))
|
||||
(modify-inputs (package-native-inputs emacs)
|
||||
(prepend autoconf automake guile-for-guile-emacs)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments `(;; Build fails if we allow parallel build.
|
||||
#:parallel-build? #f
|
||||
|
@ -476,18 +474,18 @@ editor (with wide ints)" )
|
|||
#:tests? #f
|
||||
,@(package-arguments emacs))
|
||||
((#:configure-flags flags ''())
|
||||
`(delete "--with-cairo" ,flags))
|
||||
#~(delete "--with-cairo" #$flags))
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'autogen
|
||||
(lambda _
|
||||
(invoke "sh" "autogen.sh")))
|
||||
;; Build sometimes fails: deps/dispnew.d: No such file or directory
|
||||
(add-before 'build 'make-deps-dir
|
||||
(lambda _
|
||||
(invoke "mkdir" "-p" "src/deps")))
|
||||
(delete 'restore-emacs-pdmp)
|
||||
(delete 'strip-double-wrap))))))))
|
||||
#~(modify-phases #$phases
|
||||
(add-after 'unpack 'autogen
|
||||
(lambda _
|
||||
(invoke "sh" "autogen.sh")))
|
||||
;; Build sometimes fails: deps/dispnew.d: No such file or directory
|
||||
(add-before 'build 'make-deps-dir
|
||||
(lambda _
|
||||
(invoke "mkdir" "-p" "src/deps")))
|
||||
(delete 'restore-emacs-pdmp)
|
||||
(delete 'strip-double-wrap))))))))
|
||||
|
||||
(define-public m17n-db
|
||||
(package
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue