From 1abd5bef0f642940052a3692712c99143ca0ccb9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 14 Mar 2025 19:53:30 +0100
Subject: [PATCH 1/2] fish: skip failing test on aarch64-linux

---
 pkgs/by-name/fi/fish/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 96386d8c2a0b..ce1c37ff021b 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -321,6 +321,12 @@ stdenv.mkDerivation (finalAttrs: {
   preCheck = ''
     export TERMINFO="${ncurses}/share/terminfo"
   '';
+  checkFlags = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+    # thread 'tests::string_escape::test_escape_random_url' panicked at src/tests/string_escape.rs:122:9:
+    # assertion `left == right` failed: Escaped and then unescaped string ... but got back a different string ...
+    # https://github.com/fish-shell/fish-shell/issues/11254
+    "--skip=tests::string_escape::test_escape_random_url"
+  ];
 
   nativeInstallCheckInputs = [
     versionCheckHook

From e3c72248bb6b99f917b8bdc85d4bf5feb5735981 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 14 Mar 2025 19:56:41 +0100
Subject: [PATCH 2/2] fish: cleanup

---
 pkgs/by-name/fi/fish/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index ce1c37ff021b..c26c23de32ff 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -267,11 +267,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags =
     [
-      "-DCMAKE_INSTALL_DOCDIR=${placeholder "doc"}/share/doc/fish"
-      "-DRust_CARGO_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"
+      (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "${placeholder "doc"}/share/doc/fish")
+      (lib.cmakeFeature "Rust_CARGO_TARGET" stdenv.hostPlatform.rust.rustcTarget)
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-DMAC_CODESIGN_ID=OFF"
+      (lib.cmakeBool "MAC_CODESIGN_ID" false)
     ];
 
   # Fish’s test suite needs to be able to look up process information and send signals.
@@ -381,13 +381,13 @@ stdenv.mkDerivation (finalAttrs: {
       tee -a $out/share/fish/__fish_build_paths.fish < ${fishPreInitHooks}
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Smart and user-friendly command line shell";
     homepage = "https://fishshell.com/";
-    changelog = "https://github.com/fish-shell/fish-shell/releases/tag/${version}";
-    license = licenses.gpl2Only;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/fish-shell/fish-shell/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
       adamcstephens
       cole-h
       winter