Skip to content

Commit

Permalink
Fix build - add a patch from Debian
Browse files Browse the repository at this point in the history
svn path=/nixpkgs/trunk/; revision=27488
  • Loading branch information
7c6f434c committed Jun 16, 2011
1 parent c81069e commit 0234b96
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
43 changes: 43 additions & 0 deletions pkgs/development/libraries/wvstreams/compile.patch
@@ -0,0 +1,43 @@
Debian's patch to build with fresher GCC

Index: wvstreams-4.6.1/crypto/wvx509.cc
===================================================================
--- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584 +0200
+++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200
@@ -1157,7 +1157,7 @@

if (ext)
{
- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
+ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext);
if (!method)
{
WvDynBuf buf;
Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc
===================================================================
--- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200
+++ wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:35.283136585 +0200
@@ -1,8 +1,6 @@
#include "wvunixdgsocket.h"
-#ifdef MACOS
#include <sys/types.h>
#include <sys/stat.h>
-#endif

WvUnixDGSocket::WvUnixDGSocket(WvStringParm filename, bool _server, int perms)
: socketfile(filename)
Index: wvstreams-4.6.1/streams/wvatomicfile.cc
===================================================================
--- wvstreams-4.6.1.orig/streams/wvatomicfile.cc 2011-05-20 00:02:38.223136584 +0200
+++ wvstreams-4.6.1/streams/wvatomicfile.cc 2011-05-20 00:02:31.619136587 +0200
@@ -10,10 +10,7 @@
#include "wvatomicfile.h"
#include "wvfileutils.h"
#include "wvstrutils.h"
-
-#ifdef MACOS
#include <sys/stat.h>
-#endif

WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode)
: tmp_file(WvString::null)
2 changes: 2 additions & 0 deletions pkgs/development/libraries/wvstreams/default.nix
Expand Up @@ -8,6 +8,8 @@ stdenv.mkDerivation {
sha256 = "0cvnq3mvh886gmxh0km858aqhx30hpyrfpg1dh6ara9sz3xza0w4";
};

patches = [ ./compile.patch ];

preConfigure = ''
find -type f | xargs sed -i 's@/bin/bash@bash@g'
'';
Expand Down

0 comments on commit 0234b96

Please sign in to comment.