diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-16 16:01:49 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-24 16:23:23 +0200 |
| commit | 425ccde6ae7bd4b448ee2fffd8c0b6b7bcbb543c (patch) | |
| tree | 145a510a65828591121aa5a24f8e2aeca0986ed1 /gnu/packages/irods.scm | |
| parent | d76b2f82af738ef4c006fba9efd30c28e3d76736 (diff) | |
| download | guix-425ccde6ae7bd4b448ee2fffd8c0b6b7bcbb543c.tar.gz | |
gnu: Use 'search-input-directory' when looking for C/C++ library headers.
* gnu/packages/arcan.scm (arcan)[arguments]: Use 'search-input-directory' for "include/libdrm" and "include/apr-1". * gnu/packages/bioinformatics.scm (sailfish): Likewise for jellyfish. * gnu/packages/boost.scm (boost-for-irods): Likewise for libcxx headers. * gnu/packages/cedille.scm (cedille): Likewise for IAL headers. * gnu/packages/compression.scm (snappy-with-clang6): Likewise for libcxx headers. * gnu/packages/cups.scm (hplip): Likewise for libusb headers. * gnu/packages/emulators.scm (pcsxr): Likewise for libcdio headers. * gnu/packages/game-development.scm (python2-renpy): Likewise for fribidi headers. * gnu/packages/games.scm (pokerth): Likewise for libircclient. * gnu/packages/guile-xyz.scm (guile-persist): Likewise for Guile. * gnu/packages/hurd.scm (hurd): Likewise for libtirpc. * gnu/packages/irods.scm (irods, irods-client-icommands): Likewise for libcxx, catch2, and nlohmann-json-cpp. * gnu/packages/julia.scm (julia): Use 'search-input-file' for libuv's errno.h. * gnu/packages/kde-pim.scm (kdepim-runtime): Use 'search-input-directory' for "include/KF5". (kmessagelib): Likewise. * gnu/packages/kde.scm (kdeconnect): Likewise. * gnu/packages/llvm.scm (clang-runtime-3.5): Likewise for libtirpc. * gnu/packages/mpi.scm (openmpi): Likewise for "include/infiniband". * gnu/packages/pumpio.scm (pumpa): Use 'search-input-file' for "tidy.h" and "aspell.h". * gnu/packages/radio.scm (dream): Use 'search-input-file' and 'search-input-directory' for pulseaudio, sndfile, etc. * gnu/packages/selinux.scm (policycoreutils): Likewise for PAM and libaudit. * gnu/packages/serialization.scm (avro-cpp-1.9-for-irods): Likewise for libcxx. * gnu/packages/sync.scm (nextcloud-client): Likewise for "include/KF5". * gnu/packages/video.scm (mkvtoolnix): Likewise for "include/gtest". (libopenshot): Likewise for "include/UnitTest++". * gnu/packages/virtualization.scm (criu): Likewise for libnl3 and for protobuf file.
Diffstat (limited to 'gnu/packages/irods.scm')
| -rw-r--r-- | gnu/packages/irods.scm | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gnu/packages/irods.scm b/gnu/packages/irods.scm index bb0263682c..e82888e7ae 100644 --- a/gnu/packages/irods.scm +++ b/gnu/packages/irods.scm @@ -126,12 +126,9 @@ (let ((gcc (assoc-ref inputs "gcc"))) (setenv "CPLUS_INCLUDE_PATH" (string-join - (cons* (string-append (assoc-ref inputs "libcxx+libcxxabi") - "/include/c++/v1") - (string-append (assoc-ref inputs "catch2") - "/include/catch2") - (string-append (assoc-ref inputs "json") - "/include/nlohmann") + (cons* (search-input-directory inputs "/include/c++/v1") + (search-input-directory inputs "/include/catch2") + (search-input-directory inputs "/include/nlohmann") ;; Hide GCC's C++ headers so that they do not interfere with ;; the Clang headers. (delete (string-append gcc "/include/c++") @@ -231,10 +228,10 @@ stored.") (let ((gcc (assoc-ref inputs "gcc"))) (setenv "CPLUS_INCLUDE_PATH" (string-join - (cons* (string-append (assoc-ref inputs "libcxx+libcxxabi") - "/include/c++/v1") - (string-append (assoc-ref inputs "json") - "/include/nlohmann") + (cons* (search-input-directory inputs + "include/c++/v1") + (search-input-directory inputs + "include/nlohmann") ;; Hide GCC's C++ headers so that they do not interfere with ;; the Clang headers. (delete (string-append gcc "/include/c++") |