me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Guillaume Le Vaillant 2021-09-05 13:56:25 +02:00
parent 79edda3874
commit c5bb7b5d97
No known key found for this signature in database
GPG Key ID: 6BE8208ADF21FE3F
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnu/packages/android.scm
View File

@ -362,10 +362,12 @@ various Android core host applications.")
(arguments (arguments
`(#:tests? #f ; Test failure: sysdeps_poll.fd_count `(#:tests? #f ; Test failure: sysdeps_poll.fd_count
#:make-flags #:make-flags
,#~(list "CFLAGS=-Wno-error" ,#~(list
"CXXFLAGS=-fpermissive -Wno-error -std=gnu++14 -D_Nonnull= -D_Nullable= -I ." "CFLAGS=-Wno-error"
(string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib " "CXXFLAGS=-fpermissive -Wno-error -std=gnu++14 -D_Nonnull= -D_Nullable= -I ."
"-Wl,-rpath=" #$openssl "/lib -L .")) (string-append
"LDFLAGS=-Wl,-rpath=" #$output "/lib "
"-Wl,-rpath=" #$(this-package-input "openssl") "/lib -L ."))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'enter-source (add-after 'unpack 'enter-source
@ -532,16 +534,18 @@ the core SELinux management utilities.")
(build-system android-ndk-build-system) (build-system android-ndk-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
,#~(list (string-append "CPPFLAGS=" ,#~(list
;"-Wno-error " (string-append
"-I " #$android-libselinux "/include " "CPPFLAGS="
"-I " #$android-libsparse "/include " ;"-Wno-error "
"-I " #$android-libcutils "/include " "-I " #$(this-package-input "android-libselinux") "/include "
"-I " #$android-liblog "/include " "-I " #$(this-package-input "android-libsparse") "/include "
"-I ../core/include") "-I " #$(this-package-input "android-libcutils") "/include "
"CFLAGS=-Wno-error" "-I " #$(this-package-input "android-liblog") "/include "
"install-libext4_utils_host.a" "-I ../core/include")
(string-append "prefix=" #$output)) "CFLAGS=-Wno-error"
"install-libext4_utils_host.a"
(string-append "prefix=" #$output))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'unpack-core (add-after 'unpack 'unpack-core

3
gnu/packages/finance.scm
View File

@ -793,7 +793,8 @@ the Monero command line client and daemon.")
#:configure-flags #:configure-flags
,#~(list "-DARCH=default" ,#~(list "-DARCH=default"
"-DENABLE_PASS_STRENGTH_METER=ON" "-DENABLE_PASS_STRENGTH_METER=ON"
(string-append "-DReadline_ROOT_DIR=" #$readline)) (string-append "-DReadline_ROOT_DIR="
#$(this-package-input "readline")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'extract-monero-sources (add-after 'unpack 'extract-monero-sources

6
gnu/packages/lisp.scm
View File

@ -150,15 +150,15 @@ Definition Facility.")
#:configure-flags ,#~(list #:configure-flags ,#~(list
"--enable-ansi" ; required by the maxima package "--enable-ansi" ; required by the maxima package
(string-append "CFLAGS=-I" (string-append "CFLAGS=-I"
#$libtirpc #$(this-package-input "libtirpc")
"/include/tirpc") "/include/tirpc")
(string-append "LDFLAGS=-L" (string-append "LDFLAGS=-L"
#$libtirpc #$(this-package-input "libtirpc")
"/lib") "/lib")
"LIBS=-ltirpc") "LIBS=-ltirpc")
#:make-flags ,#~(list #:make-flags ,#~(list
(string-append "GCL_CC=" #$gcc "/bin/gcc") (string-append "GCL_CC=" #$gcc "/bin/gcc")
(string-append "CC=" #$gcc "/bin/gcc")) (string-append "CC="#$gcc "/bin/gcc"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'realpath-workaround (add-after 'unpack 'realpath-workaround