diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-10-04 12:30:47 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-10-05 11:59:49 +0200 |
| commit | b5c84b8a37aa268c370ad9c1cf335e5b6c1b3420 (patch) | |
| tree | 406ca950b2e324b6fbe592a62443538248b8ca71 /gnu/packages/cryptsetup.scm | |
| parent | d5e445e1d5b1db458f679f9c37acaf87b922b6cb (diff) | |
gnu: cryptsetup-static: Don't build veritysetup.
* gnu/packages/cryptsetup.scm (cryptsetup-static)[arguments]: Pass
‘--disable-veritysetup’ #:configure-flag. Adjust ‘remove-cruft’ phase.
Diffstat (limited to 'gnu/packages/cryptsetup.scm')
| -rw-r--r-- | gnu/packages/cryptsetup.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index aae1082a38e..84251352451 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> | 2 | ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> |
| 3 | ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> | 3 | ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> |
| 4 | ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> | ||
| 4 | ;;; | 5 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 6 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 7 | ;;; |
| @@ -81,6 +82,8 @@ files). This assumes LIBRARY uses Libtool." | |||
| 81 | '(#:configure-flags '("--disable-shared" | 82 | '(#:configure-flags '("--disable-shared" |
| 82 | "--enable-static-cryptsetup" | 83 | "--enable-static-cryptsetup" |
| 83 | 84 | ||
| 85 | "--disable-veritysetup" | ||
| 86 | |||
| 84 | ;; 'libdevmapper.a' pulls in libpthread, libudev and libm. | 87 | ;; 'libdevmapper.a' pulls in libpthread, libudev and libm. |
| 85 | "LIBS=-ludev -pthread -lm") | 88 | "LIBS=-ludev -pthread -lm") |
| 86 | 89 | ||
| @@ -94,8 +97,7 @@ files). This assumes LIBRARY uses Libtool." | |||
| 94 | #:phases (modify-phases %standard-phases | 97 | #:phases (modify-phases %standard-phases |
| 95 | (add-after 'install 'remove-cruft | 98 | (add-after 'install 'remove-cruft |
| 96 | (lambda* (#:key outputs #:allow-other-keys) | 99 | (lambda* (#:key outputs #:allow-other-keys) |
| 97 | ;; Remove everything except the 'cryptsetup' command and | 100 | ;; Remove everything except the 'cryptsetup' command. |
| 98 | ;; its friend. | ||
| 99 | (let ((out (assoc-ref outputs "out"))) | 101 | (let ((out (assoc-ref outputs "out"))) |
| 100 | (with-directory-excursion out | 102 | (with-directory-excursion out |
| 101 | (let ((dirs (scandir "." | 103 | (let ((dirs (scandir "." |
| @@ -109,7 +111,7 @@ files). This assumes LIBRARY uses Libtool." | |||
| 109 | ".static") | 111 | ".static") |
| 110 | file) | 112 | file) |
| 111 | (remove-store-references file)) | 113 | (remove-store-references file)) |
| 112 | '("sbin/cryptsetup" "sbin/veritysetup")) | 114 | '("sbin/cryptsetup")) |
| 113 | #t)))))))) | 115 | #t)))))))) |
| 114 | (inputs | 116 | (inputs |
| 115 | (let ((libgcrypt-static | 117 | (let ((libgcrypt-static |
