From 2c9c395a229dcccf2dc492b68659d153b485aedd Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Mon, 15 Jul 2019 14:45:52 -0700
Subject: fish: use internal wcwidth

Fish 3.0 has an updated an more robust handling of unicode glyphs. Per
the original author of the INTERNAL_WCWIDTH flag, it was something of
misfeature, and they regret that NixOS came to rely on it.

Removes the flag from the Nix expression.

Flag was added originally to Nixpkgs in 68076b7d4938ce788dc9eaaf8789dfccc30e2ca2

It is being removed entirely from upstream fish:
https://github.com/fish-shell/fish-shell/pull/5777.
---
 pkgs/shells/fish/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pkgs/shells')

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 32d87d7cc1b..df8b5d824f1 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -102,7 +102,6 @@ let
 
     nativeBuildInputs = [ cmake ];
     buildInputs = [ ncurses libiconv pcre2 ];
-    cmakeFlags = [ "-DINTERNAL_WCWIDTH=OFF" ];
 
     preConfigure = ''
       patchShebangs ./build_tools/git_version_gen.sh
-- 
cgit 1.4.1