diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-28 03:53:13 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-28 03:53:13 +0100 |
| commit | ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a (patch) | |
| tree | f24483d86a18d3d11e14457409f02055a88a2af1 /pkgs/development | |
| parent | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (diff) | |
| download | nixlib-ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a.tar nixlib-ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a.tar.gz nixlib-ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a.tar.bz2 nixlib-ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a.tar.lz nixlib-ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a.tar.xz nixlib-ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a.tar.zst nixlib-ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a.zip | |
openssl: fix merge conflict between b6dabe3 and 6e7ca92
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index f706ba97f7f5..0c32bf034387 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -17,7 +17,7 @@ let }; patches = - args.patches + (args.patches or []) ++ optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch ++ optional |