From 71c0ea5ccebbdff3ef88422ee41dfee99ecaa3b5 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 28 Mar 2023 17:31:14 -0300 Subject: etc/guix/home.scm: Fix build of "apk-tools" package --- etc/guix/home.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/etc/guix/home.scm b/etc/guix/home.scm index 41c7855..f91861e 100644 --- a/etc/guix/home.scm +++ b/etc/guix/home.scm @@ -48,7 +48,7 @@ (build-system gnu-build-system) (arguments (list - #:tests? #f ;; depends on Kyua, which depends on ATF + #:tests? #f ;; depends on Kyua, which depends on ATF... #:make-flags #~(list "CC=gcc" @@ -92,12 +92,10 @@ (build-system gnu-build-system) (arguments (list - ;; #:strip-binaries? #f - ;; #:validate-runpath? #f #:make-flags #~(list "LUA=no" - "VERBOSE=1" + (string-append "LDFLAGS=-g -Wl,-rpath=" #$output "/lib") (string-append "DOCDIR=" #$output "/share/doc/apk") (string-append "INCLUDEDIR=" #$output "/include") (string-append "LIBDIR=" #$output "/lib") @@ -106,11 +104,7 @@ (string-append "SBINDIR=" #$output "/sbin")) #:phases #~(modify-phases %standard-phases - (delete 'configure) - (add-after 'build 'ldd - (lambda _ - (invoke "ldd" "src/libapk.so.3.12.0") - (invoke "ldd" "src/apk")))))) + (delete 'configure)))) (inputs (list openssl @@ -692,7 +686,7 @@ left it off the last time it was used.") firefox)) (list ;; cmucl abuild - ;; apk-tools + apk-tools tmux-plugin-continuum hunspell-iconv (hunspell-dictionary-utf8 "en") -- cgit v1.2.3