From b5c84b8a37aa268c370ad9c1cf335e5b6c1b3420 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 4 Oct 2019 12:30:47 +0200 Subject: gnu: cryptsetup-static: Don't build veritysetup. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cryptsetup.scm (cryptsetup-static)[arguments]: Pass ‘--disable-veritysetup’ #:configure-flag. Adjust ‘remove-cruft’ phase. --- gnu/packages/cryptsetup.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index aae1082a38..8425135245 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,6 +82,8 @@ files). This assumes LIBRARY uses Libtool." '(#:configure-flags '("--disable-shared" "--enable-static-cryptsetup" + "--disable-veritysetup" + ;; 'libdevmapper.a' pulls in libpthread, libudev and libm. "LIBS=-ludev -pthread -lm") @@ -94,8 +97,7 @@ files). This assumes LIBRARY uses Libtool." #:phases (modify-phases %standard-phases (add-after 'install 'remove-cruft (lambda* (#:key outputs #:allow-other-keys) - ;; Remove everything except the 'cryptsetup' command and - ;; its friend. + ;; Remove everything except the 'cryptsetup' command. (let ((out (assoc-ref outputs "out"))) (with-directory-excursion out (let ((dirs (scandir "." @@ -109,7 +111,7 @@ files). This assumes LIBRARY uses Libtool." ".static") file) (remove-store-references file)) - '("sbin/cryptsetup" "sbin/veritysetup")) + '("sbin/cryptsetup")) #t)))))))) (inputs (let ((libgcrypt-static -- cgit v1.2.3