diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
| commit | 6901878894e9c6405fa811c512a32f448e8b9fa2 (patch) | |
| tree | 5b04c4234f4022533692c36a83047ec9801aada9 /gnu/packages/wm.scm | |
| parent | baf766a7ff9db45c707b4539176f2143fbd90efd (diff) | |
| parent | 58c6a93d9d60660d8425d8c52d4b73a42d4a5b55 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/wm.scm')
| -rw-r--r-- | gnu/packages/wm.scm | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index fd89df0c16..f1f3c25391 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 xd1le <elisp.vim@gmail.com> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> -;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> @@ -675,20 +675,27 @@ drags, snap-to-border support, and virtual desktops.") `(#:make-flags '("CPPFLAGS=-U__TIME__") ;ugly, but for reproducibility #:phases (modify-phases %standard-phases - (add-after - 'install 'install-xsession - (lambda _ - (let ((xsessions (string-append %output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file - (string-append xsessions "/fluxbox.desktop") - (lambda (port) - (format port "~ - [Desktop Entry]~@ - Name=~a~@ - Comment=~a~@ - Exec=~a/bin/startfluxbox~@ - Type=Application~%" ,name ,synopsis %output))))))))) + (add-after 'install 'install-vim-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (syntax (string-append out "/share/vim/vimfiles/syntax"))) + (copy-recursively "3rd/vim/vim/syntax" syntax) + #t))) + (add-after 'install 'install-xsession + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xsessions (string-append out "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file + (string-append xsessions "/fluxbox.desktop") + (lambda (port) + (format port "~ + [Desktop Entry]~@ + Name=~a~@ + Comment=~a~@ + Exec=~a/bin/startfluxbox~@ + Type=Application~%" ,name ,synopsis out))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs |