From 425ccde6ae7bd4b448ee2fffd8c0b6b7bcbb543c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 16 Jul 2021 16:01:49 +0200 Subject: 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. --- gnu/packages/kde-pim.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gnu/packages/kde-pim.scm') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index db73941b42..0c7fa77b1e 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -757,10 +757,9 @@ (define-public kdepim-runtime ;; found during one of the compilation steps without ;; this hack. (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "akonadi-mime") - "/include/KF5:" - (or (getenv "CPLUS_INCLUDE_PATH") ""))) - #t))))) + (string-append + (search-input-directory inputs "include/KF5") + ":" (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) (home-page "https://invent.kde.org/pim/kdepim-runtime") (synopsis "Runtime components for Akonadi KDE") (description "This package contains Akonadi agents written using KDE @@ -1369,10 +1368,9 @@ (define-public kmessagelib ;; FIXME: One of the compilation steps fail to find ;; without this hack. (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "libkdepim") - "/include/KF5:" - (or (getenv "CPLUS_INCLUDE_PATH") ""))) - #t))))) + (string-append + (search-input-directory inputs "include/KF5") + ":" (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) (home-page "https://invent.kde.org/pim/messagelib") (synopsis "KDE PIM messaging libraries") (description "This package provides several libraries for messages, -- cgit v1.2.3