add fish 4.3.2

This commit is contained in:
Moritz Gmeiner 2025-12-31 23:49:20 +01:00
commit 786da8bfca
4 changed files with 175 additions and 0 deletions

View file

@ -0,0 +1,19 @@
fish is now installed on your system.
To run fish, type 'fish' in your terminal.
It is advised not to set fish as a default login shell.
see https://bugs.gentoo.org/545830 for more details.
Executing fish using ~/.bashrc is an alternative
see https://wiki.gentoo.org/wiki/Fish#Caveats for details
To set your colors, run 'fish_config'
To scan your man pages for completions, run 'fish_update_completions'
To autocomplete command suggestions press Ctrl + F or right arrow key.
Please add a "BROWSER" variable to fish environment pointing to the
browser of your choice to get acces to fish help system:
BROWSER="/usr/bin/firefox"
If you have issues with cut'n'paste in X-terminals, install the x11-misc/xsel package.
Have fun!

View file

@ -0,0 +1,46 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c65b3e422..caf670f0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,18 +60,7 @@ add_custom_target(
fish ALL
COMMAND
"${CMAKE_COMMAND}" -E
- env ${VARS_FOR_CARGO}
- ${Rust_CARGO}
- build --bin fish
- $<$<CONFIG:Release>:--release>
- $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
- --target ${Rust_CARGO_TARGET}
- --no-default-features
- --features=${FISH_CARGO_FEATURES}
- ${CARGO_FLAGS}
- &&
- "${CMAKE_COMMAND}" -E
- copy "${rust_target_dir}/${rust_profile}/fish" "${CMAKE_CURRENT_BINARY_DIR}"
+ copy "${FISH_RUST_BUILD_DIR}/${rust_profile}/fish" "${CMAKE_CURRENT_BINARY_DIR}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
USES_TERMINAL
)
diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake
index d99e621e4..4d6b47f2a 100644
--- a/cmake/Rust.cmake
+++ b/cmake/Rust.cmake
@@ -1,7 +1,7 @@
include(FindRust)
find_package(Rust REQUIRED)
-set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build")
+set(FISH_RUST_BUILD_DIR "${CMAKE_SOURCE_DIR}/target")
if(DEFINED ASAN)
list(APPEND CARGO_FLAGS "-Z" "build-std")
@@ -18,7 +18,7 @@ else()
set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
endif()
-set(rust_profile $<IF:$<CONFIG:Debug>,debug,$<IF:$<CONFIG:RelWithDebInfo>,release-with-debug,release>>)
+set(rust_profile $<IF:$<CONFIG:Debug>,debug,release>)
option(WITH_GETTEXT "Build with gettext localization support. Requires `msgfmt` to work." ON)
# Enable gettext feature unless explicitly disabled.