public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl: fix merge conflict between b6dabe3 and 6e7ca92

Browse Source
This commit is contained in:
obadz 2016-08-28 03:53:13 +01:00
parent 3de6e5be50
commit ed01e0ca4f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/openssl/default.nix
View File

@ -17,7 +17,7 @@ let
}; };
patches = patches =
args.patches (args.patches or [])
++ optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch ++ optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch
++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
++ optional ++ optional