Merge branch 'master' into core-updates

This commit is contained in:
Ricardo Wurmus 2018-02-18 00:37:46 +01:00
commit ff9d1a2f0c
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
17 changed files with 812 additions and 27 deletions

View file

@ -3153,10 +3153,12 @@ and copy/paste text in the console and in xterm.")
(lambda _ (zero? (system* "make" "static"))))
(add-after 'install 'install-bash-completion
(lambda* (#:key outputs #:allow-other-keys)
(install-file "btrfs-completion"
(string-append (assoc-ref outputs "out")
"/etc/bash_completion.d"))
#t))
(let* ((out (assoc-ref outputs "out"))
(bashcomp (string-append out "/etc/bash_completion.d")))
(mkdir-p bashcomp)
(copy-file "btrfs-completion"
(string-append bashcomp "/btrfs"))
#t)))
(add-after 'install 'install-static
(let ((staticbin (string-append (assoc-ref %outputs "static")
"/bin")))