commit:     cf9b683021fac76f046d72ea182818205f5145e9
Author:     idealseal <realidealseal <AT> protonmail <DOT> com>
AuthorDate: Tue Feb 17 19:15:28 2026 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 19:59:29 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9b6830

app-shells/fish: sync live

Add build workaround to re-enable loading files from vendor_*.d
directories.

Bug: https://bugs.gentoo.org/970077
Signed-off-by: idealseal <realidealseal <AT> protonmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/82
Merges: https://codeberg.org/gentoo/gentoo/pulls/82
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-shells/fish/fish-9999.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
index 4be6318a49fa..f0ed4963569d 100644
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@@ -69,10 +69,8 @@ src_configure() {
                -DWITH_DOCS="$(usex doc)"
                -DWITH_MESSAGE_LOCALIZATION="$(usex nls 1 0)"
        )
-       cargo_src_configure --no-default-features \
-               --bin fish \
-               --bin fish_indent \
-               --bin fish_key_reader
+
+       cargo_src_configure --no-default-features
        cmake_src_configure
 }
 
@@ -87,6 +85,10 @@ src_compile() {
        local -x FISH_BUILD_DOCS
        FISH_BUILD_DOCS="$(usex doc 1 0)"
 
+       # HACK: Let the rust build script know we are using CMake.
+       # Bug: https://bugs.gentoo.org/970077
+       local -x FISH_CMAKE_BINARY_DIR="${BUILD_DIR}"
+
        cargo_src_compile
 }
 

Reply via email to