diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-07-29 09:41:29 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-07-29 09:41:29 +0000 |
| commit | bfbdc2db7c93b6dedcafaee8f541e167a991eab6 (patch) | |
| tree | 30cc4a4bfc791016c9b50d6274a740c9e8b6ebcf | |
| parent | 370f15acf3cee017fa558d34292463d96dadc731 (diff) | |
| download | nixpkgs-bfbdc2db7c93b6dedcafaee8f541e167a991eab6.tar nixpkgs-bfbdc2db7c93b6dedcafaee8f541e167a991eab6.tar.gz nixpkgs-bfbdc2db7c93b6dedcafaee8f541e167a991eab6.tar.bz2 nixpkgs-bfbdc2db7c93b6dedcafaee8f541e167a991eab6.tar.lz nixpkgs-bfbdc2db7c93b6dedcafaee8f541e167a991eab6.tar.xz nixpkgs-bfbdc2db7c93b6dedcafaee8f541e167a991eab6.tar.zst nixpkgs-bfbdc2db7c93b6dedcafaee8f541e167a991eab6.zip | |
Stole a patch from gentoo to fix the compilation of libmsn against OpenSSL-1.0.0
svn path=/nixpkgs/trunk/; revision=22805
| -rw-r--r-- | pkgs/development/libraries/libmsn/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libmsn/default.nix b/pkgs/development/libraries/libmsn/default.nix index 77f8b572778..3d7f20291b9 100644 --- a/pkgs/development/libraries/libmsn/default.nix +++ b/pkgs/development/libraries/libmsn/default.nix @@ -6,5 +6,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/libmsn/${name}.tar.bz2"; sha256 = "0p3c3gidnq4ai697dgg930hm7aap4176sbq7w7nn0mxg4rg5gwfx"; }; + patches = [ ./libmsn-4.1-openssl-1.patch ]; + patchFlags = "-p0"; buildInputs = [ cmake openssl ]; } diff --git a/pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch b/pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch new file mode 100644 index 00000000000..cdaecf7dc54 --- /dev/null +++ b/pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/328031 + +--- msntest/msntest.cpp ++++ msntest/msntest.cpp +@@ -259,7 +259,11 @@ + if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected) + { + BIO *bio_socket_new; +- SSL_METHOD *meth=NULL; ++ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *meth=NULL; ++ #else ++ SSL_METHOD *meth=NULL; ++ #endif + meth=SSLv23_client_method(); + SSLeay_add_ssl_algorithms(); + mySocketsSsl[i].ctx = SSL_CTX_new(meth); |