openssl: fix merge conflict between b6dabe3 and 6e7ca92

2016-08-28 03:53:13 +01:00 · 2016-08-28 03:53:13 +01:00 · ed01e0ca4f
commit ed01e0ca4f
parent 3de6e5be50
1 changed files with 1 additions and 1 deletions
--- 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