From c5bb7b5d97b341c625c269b21e4958d61e7f40c9 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Sun, 5 Sep 2021 13:56:25 +0200
Subject: 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.
---
 gnu/packages/android.scm | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'gnu/packages/android.scm')

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 @@ (define-public adb
     (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 @@ (define-public android-ext4-utils
     (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
-- 
cgit v1.2.3