diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:13:53 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:13:53 +0300 |
| commit | 4ff8f377afcfcb206c585f165dc1332c9fb1eba1 (patch) | |
| tree | 2df363c4be265610f3982377b3a1dc61870a544a /pkgs/shells | |
| parent | 7ac1ef05fa162d8e3c35925034df72288df77c8b (diff) | |
| parent | 49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4 (diff) | |
| download | nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.gz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.bz2 nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.lz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.xz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.zst nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 5bb7100a620f..8916cca0f044 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { sed -e "s|expr|${coreutils}/bin/expr|" \ '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' -e "s|if which unicode_start|if true|" \ + '' + stdenv.lib.optionalString stdenv.isLinux '' -e "s|unicode_start|${kbd}/bin/unicode_start|" \ '' + '' -i "$out/etc/fish/config.fish" |