fish: 3.1.2 -> 3.2.0

functions/{type.fish,_.fish}: removed, now a builtin

macOS: disable codesigning with CMake flag instead of patching the
CMakeLists.txt.
This commit is contained in:
Vincent Haupert 2021-02-21 17:51:01 +01:00 committed by Cole Helbling
parent 1941313b6c
commit 62f9a381a0
2 changed files with 5 additions and 24 deletions

View file

@ -130,7 +130,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
version = "3.1.2";
version = "3.2.0";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@ -139,14 +139,10 @@ let
# the shell's actual version (and what it displays when running `fish
# --version`), as well as the local documentation for all builtins (and
# maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm";
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-TwKT7Z9qa3fkfUHvq+YvMxnobvyL+DzFhzMET7xvkhE=";
};
# We don't have access to the codesign executable, so we patch this out.
# For more information, see: https://github.com/fish-shell/fish-shell/issues/6952
patches = lib.optional stdenv.isDarwin ./dont-codesign-on-mac.diff;
nativeBuildInputs = [
cmake
];
@ -159,6 +155,8 @@ let
cmakeFlags = [
"-DCMAKE_INSTALL_DOCDIR=${placeholder "out"}/share/doc/fish"
] ++ lib.optionals stdenv.isDarwin [
"-DMAC_CODESIGN_ID=OFF"
];
preConfigure = ''
@ -179,13 +177,8 @@ let
postInstall = with lib; ''
sed -r "s|command grep|command ${gnugrep}/bin/grep|" \
-i "$out/share/fish/functions/grep.fish"
sed -i "s|which |${which}/bin/which |" \
"$out/share/fish/functions/type.fish"
sed -e "s|\|cut|\|${coreutils}/bin/cut|" \
-i "$out/share/fish/functions/fish_prompt.fish"
sed -e "s|gettext |${gettext}/bin/gettext |" \
-e "s|which |${which}/bin/which |" \
-i "$out/share/fish/functions/_.fish"
sed -e "s|uname|${coreutils}/bin/uname|" \
-i "$out/share/fish/functions/__fish_pwd.fish" \
"$out/share/fish/functions/prompt_pwd.fish"

View file

@ -1,12 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d220a032..786b60e6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,7 +183,6 @@ ENDFUNCTION(CODESIGN_ON_MAC target)
# Define a function to link dependencies.
FUNCTION(FISH_LINK_DEPS_AND_SIGN target)
TARGET_LINK_LIBRARIES(${target} fishlib)
- CODESIGN_ON_MAC(${target})
ENDFUNCTION(FISH_LINK_DEPS_AND_SIGN)
# Define libfish.a.