diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-02-28 22:08:54 +0000 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-02-28 22:08:54 +0000 |
| commit | 79c3725185066784129eaeb0282340ef827dd38a (patch) | |
| tree | b95e033902dbc2a3f6194135f26e287a88707734 /pkgs | |
| parent | 8c7ccdd5568da589b4c82e6004b006b9376b927b (diff) | |
| parent | a93a2e23609dcc3fc20c84415219a872222d881f (diff) | |
| download | nixlib-79c3725185066784129eaeb0282340ef827dd38a.tar nixlib-79c3725185066784129eaeb0282340ef827dd38a.tar.gz nixlib-79c3725185066784129eaeb0282340ef827dd38a.tar.bz2 nixlib-79c3725185066784129eaeb0282340ef827dd38a.tar.lz nixlib-79c3725185066784129eaeb0282340ef827dd38a.tar.xz nixlib-79c3725185066784129eaeb0282340ef827dd38a.tar.zst nixlib-79c3725185066784129eaeb0282340ef827dd38a.zip | |
Merge pull request #13498 from tsion/fish-darwin
Remove fish's kbd dependency on darwin.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 11eeb18661c0..88754fd95a15 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { postInstall = '' sed -e "s|expr|${coreutils}/bin/expr|" \ + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' -e "s|if which unicode_start|if true|" \ -e "s|unicode_start|${kbd}/bin/unicode_start|" \ + '' + '' -i "$out/etc/fish/config.fish" sed -e "s|bc|${bc}/bin/bc|" \ -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \ |