From 37f7853e1359ae0a46b6fcb223145b690fdd051f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Feb 2019 21:17:19 +0200 Subject: gnu: fluxbox: Install vim helper files. * gnu/packages/wm.scm (fluxbox)[arguments]: Add custom phase to install vim files. --- gnu/packages/wm.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index fd89df0c16..6a6a94b7ce 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 xd1le ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès @@ -675,6 +675,12 @@ 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-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 _ -- cgit v1.2.3 From 4ee3b309450d849a55161bfc88951385a93f2b7c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Feb 2019 21:25:14 +0200 Subject: gnu: fluxbox: All phases return #t. * gnu/packages/wm.scm (fluxbox)[arguments]: All phases return #t. --- gnu/packages/wm.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6a6a94b7ce..f1f3c25391 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -681,20 +681,21 @@ drags, snap-to-border support, and virtual desktops.") (syntax (string-append out "/share/vim/vimfiles/syntax"))) (copy-recursively "3rd/vim/vim/syntax" syntax) #t))) - (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-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 -- cgit v1.2.3 From ebd2ae1858427d82a3f0ac90ad4c9951455757e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 23:28:40 +0100 Subject: gnu: i3-wm: Remove obsolete code. * gnu/packages/wm.scm (i3-wm)[arguments]: Remove #:make-flags. Update reason for disabled #:tests?. --- gnu/packages/wm.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f1f3c25391..c577c4021c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Meiyo Peng ;;; @@ -190,17 +190,12 @@ commands would.") "0xl56y196vxv001gvx35xwfr25zah8m3xwizp9ycdgdc0rfc4rdb")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (list "CC=gcc" - (string-append "PREFIX=" %output) - ;; This works around the following error: - ;; 'error: ‘for’ loop initial declarations are only allowed in C99 - ;; or C11 mode' - "CFLAGS=-std=c11") + `(#:configure-flags ;; The build system tries to build in a separate directory, but that ;; seems to be unnecessary. - #:configure-flags '("--disable-builddir") - ;; The test suite appears to require the unpackaged Perl module AnyEvent. + (list "--disable-builddir") + + ;; The test suite requires the unpackaged Xephyr X server. #:tests? #f)) (inputs `(("libxcb" ,libxcb) -- cgit v1.2.3 From 71a5da8e116fab0610e6797acfc6eb84e1eefcf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 00:04:03 +0100 Subject: gnu: i3-wm: Epand description. * gnu/packages/wm.scm (i3-wm)[description]: Describe more. --- gnu/packages/wm.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c577c4021c..554a14154c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -223,10 +223,16 @@ commands would.") ("libxml2" ,libxml2) ("docbook-xsl" ,docbook-xsl))) (home-page "https://i3wm.org/") - (synopsis "Improved tiling window manager") - (description "A tiling window manager, completely written -from scratch. i3 is primarily targeted at advanced users and -developers.") + (synopsis "Tiling window manager") + (description "i3 is a tiling X11 window manager that dynamically manages +tiled, stacked, and tabbed window layouts. + +i3 primarily targets advanced users. Windows are managed manually and organised +inside containers, which can be split vertically or horizontally, and optionally +resized. + +i3 uses a plain-text configuration file, and can be extended and controlled from +many programming languages.") (license license:bsd-3))) (define-public i3blocks -- cgit v1.2.3