diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2021-09-05 13:56:25 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2021-09-05 13:56:25 +0200 |
| commit | c5bb7b5d97b341c625c269b21e4958d61e7f40c9 (patch) | |
| tree | 36b76fc32785df047f641cdb62bebb6bfab85548 | |
| parent | 79edda38742b37603ccd48dd8660ff7fcfca293e (diff) | |
| download | guix-c5bb7b5d97b341c625c269b21e4958d61e7f40c9.tar.gz | |
gnu: Fix some gexps.
* gnu/packages/android.scm (adb, android-ext4-utils)[arguments]: Use 'this-package-input' in gexps. * gnu/packages/finance.scm (monero-gui)[arguments]: Idem. * gnu/packages/lisp.scm (gcl)[arguments]: Idem.
| -rw-r--r-- | gnu/packages/android.scm | 32 | ||||
| -rw-r--r-- | gnu/packages/finance.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/lisp.scm | 6 |
3 files changed, 23 insertions, 18 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index e7074715a0..cb3f491eae 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -362,10 +362,12 @@ various Android core host applications.") (arguments `(#:tests? #f ; Test failure: sysdeps_poll.fd_count #:make-flags - ,#~(list "CFLAGS=-Wno-error" - "CXXFLAGS=-fpermissive -Wno-error -std=gnu++14 -D_Nonnull= -D_Nullable= -I ." - (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib " - "-Wl,-rpath=" #$openssl "/lib -L .")) + ,#~(list + "CFLAGS=-Wno-error" + "CXXFLAGS=-fpermissive -Wno-error -std=gnu++14 -D_Nonnull= -D_Nullable= -I ." + (string-append + "LDFLAGS=-Wl,-rpath=" #$output "/lib " + "-Wl,-rpath=" #$(this-package-input "openssl") "/lib -L .")) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source @@ -532,16 +534,18 @@ the core SELinux management utilities.") (build-system android-ndk-build-system) (arguments `(#:make-flags - ,#~(list (string-append "CPPFLAGS=" - ;"-Wno-error " - "-I " #$android-libselinux "/include " - "-I " #$android-libsparse "/include " - "-I " #$android-libcutils "/include " - "-I " #$android-liblog "/include " - "-I ../core/include") - "CFLAGS=-Wno-error" - "install-libext4_utils_host.a" - (string-append "prefix=" #$output)) + ,#~(list + (string-append + "CPPFLAGS=" + ;"-Wno-error " + "-I " #$(this-package-input "android-libselinux") "/include " + "-I " #$(this-package-input "android-libsparse") "/include " + "-I " #$(this-package-input "android-libcutils") "/include " + "-I " #$(this-package-input "android-liblog") "/include " + "-I ../core/include") + "CFLAGS=-Wno-error" + "install-libext4_utils_host.a" + (string-append "prefix=" #$output)) #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-core diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 28186fb6bb..c351948e8f 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -793,7 +793,8 @@ the Monero command line client and daemon.") #:configure-flags ,#~(list "-DARCH=default" "-DENABLE_PASS_STRENGTH_METER=ON" - (string-append "-DReadline_ROOT_DIR=" #$readline)) + (string-append "-DReadline_ROOT_DIR=" + #$(this-package-input "readline"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'extract-monero-sources diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index bafe136bff..f0c30ba0d9 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -150,15 +150,15 @@ Definition Facility.") #:configure-flags ,#~(list "--enable-ansi" ; required by the maxima package (string-append "CFLAGS=-I" - #$libtirpc + #$(this-package-input "libtirpc") "/include/tirpc") (string-append "LDFLAGS=-L" - #$libtirpc + #$(this-package-input "libtirpc") "/lib") "LIBS=-ltirpc") #:make-flags ,#~(list (string-append "GCL_CC=" #$gcc "/bin/gcc") - (string-append "CC=" #$gcc "/bin/gcc")) + (string-append "CC="#$gcc "/bin/gcc")) #:phases (modify-phases %standard-phases (add-after 'unpack 'realpath-workaround |