From ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 28 Aug 2016 03:53:13 +0100
Subject: openssl: fix merge conflict between b6dabe3 and 6e7ca92

---
 pkgs/development/libraries/openssl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development')

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
-- 
cgit 1.4.1