diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-10-05 19:02:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-10-05 19:02:48 +0200 |
| commit | 30f551d8b25782611f869369e54539efe745f5ea (patch) | |
| tree | 73187d1c515078f33bfdaa5088ac41dc3f1ea2ce /pkgs/shells | |
| parent | d067b7bd3502a64b852ad8511502ed35d20cbc1b (diff) | |
| parent | 529a4050cdaf0f659534c2ba2d2565c43735ceb8 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/4.3.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/shells/bash/4.3.nix b/pkgs/shells/bash/4.3.nix index c6868eedba6c..76c24323fca9 100644 --- a/pkgs/shells/bash/4.3.nix +++ b/pkgs/shells/bash/4.3.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { inherit sha256; }; in - import ./bash-4.3-patches.nix patch) + import ./bash-4.3-patches.nix patch) ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; crossAttrs = { |