diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-10-31 18:07:26 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-11-02 17:22:28 -0800 |
| commit | 3aa7f2222883b7dc690d4f55f52366e7ced297e8 (patch) | |
| tree | 523417db06ef0a2f848cd314e5dbba1ef67ad7ce /pkgs/servers | |
| parent | 47ef7b45086acba818f56551af206aa64c4c3071 (diff) | |
| download | nixpkgs-3aa7f2222883b7dc690d4f55f52366e7ced297e8.tar nixpkgs-3aa7f2222883b7dc690d4f55f52366e7ced297e8.tar.gz nixpkgs-3aa7f2222883b7dc690d4f55f52366e7ced297e8.tar.bz2 nixpkgs-3aa7f2222883b7dc690d4f55f52366e7ced297e8.tar.lz nixpkgs-3aa7f2222883b7dc690d4f55f52366e7ced297e8.tar.xz nixpkgs-3aa7f2222883b7dc690d4f55f52366e7ced297e8.tar.zst nixpkgs-3aa7f2222883b7dc690d4f55f52366e7ced297e8.zip | |
rippled: Refactor and update to 0.26.2
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/rippled/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/servers/rippled/scons-env.patch | 46 |
2 files changed, 10 insertions, 54 deletions
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index d930c5b6a97..ca0a331e321 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, scons, pkgconfig, openssl, protobuf, boost, zlib}: +{ stdenv, fetchFromGitHub, scons, pkgconfig, openssl, protobuf, boost, zlib}: stdenv.mkDerivation rec { name = "rippled-${version}"; - version = "0.23.0"; + version = "0.26.0"; - src = fetchurl { - url = "https://github.com/ripple/rippled/archive/${version}.tar.gz"; - sha256 = "0js734sk11jn19fyp403mk6p62azlc6s9kyhr5jfg466fiak537p"; + src = fetchFromGitHub { + owner = "ripple"; + repo = "rippled"; + rev = "0.26.2"; + sha256 = "06hcc3nnzp9f6j00890f41rrn4djwlcwkzmqnw4yra74sswgji5y"; }; - patches = [ ./scons-env.patch ]; + postPatch = '' + sed -i -e "s@ENV = dict.*@ENV = os.environ@g" SConstruct + ''; buildInputs = [ scons pkgconfig openssl protobuf boost zlib ]; - RIPPLED_BOOST_HOME = boost.out; - RIPPLED_ZLIB_HOME = zlib.out; buildPhase = "scons build/rippled"; installPhase = '' diff --git a/pkgs/servers/rippled/scons-env.patch b/pkgs/servers/rippled/scons-env.patch deleted file mode 100644 index 5b80e77bb2e..00000000000 --- a/pkgs/servers/rippled/scons-env.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index 8ba8bbd..95eab3b 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -24,6 +24,8 @@ USING_CLANG = OSX or os.environ.get('CC', None) == 'clang' - # - BOOST_HOME = os.environ.get("RIPPLED_BOOST_HOME", None) - -+ZLIB_HOME = os.environ.get("RIPPLED_ZLIB_HOME", None) -+ - - if OSX or Ubuntu or Debian or Archlinux: - CTAGS = 'ctags' -@@ -36,7 +38,7 @@ else: - # scons tools - # - --HONOR_ENVS = ['CC', 'CXX', 'PATH'] -+HONOR_ENVS = ['CC', 'CXX', 'PATH', 'PKG_CONFIG_PATH'] - - env = Environment( - tools = ['default', 'protoc'], -@@ -156,8 +158,8 @@ INCLUDE_PATHS = [ - 'build/proto' - ] - --# if BOOST_HOME: --# INCLUDE_PATHS.append(BOOST_HOME) -+if BOOST_HOME: -+ INCLUDE_PATHS.append("%s/include" % BOOST_HOME) - - #------------------------------------------------------------------------------- - # -@@ -261,7 +263,11 @@ env.Append( - # such, as installed into `/usr/lib/` - if BOOST_HOME is not None: - env.Prepend( -- LIBPATH = ["%s/stage/lib" % BOOST_HOME]) -+ LIBPATH = ["%s/lib" % BOOST_HOME]) -+ -+if ZLIB_HOME is not None: -+ env.Prepend( -+ LIBPATH = ["%s/lib" % ZLIB_HOME]) - - if not OSX: - env.Append(LINKFLAGS = [ |