Merge pull request #7580 from ehmry/firestr
firestr: initial package at 0.8
This commit is contained in:
commit
ca32fbd6ee
|
@ -0,0 +1,35 @@
|
||||||
|
{ stdenv, fetchFromGitHub, cmake, boost, botan, snappy, libopus, libuuid, qt5
|
||||||
|
, libXScrnSaver, openssl }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "firestr-0.8";
|
||||||
|
|
||||||
|
buildInputs = [ cmake boost botan snappy libopus libuuid qt5 libXScrnSaver openssl ];
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mempko";
|
||||||
|
repo = "firestr";
|
||||||
|
rev = "f888890f71d49953d05bccdd27a1c4f6690e165c";
|
||||||
|
sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = ./return.patch;
|
||||||
|
|
||||||
|
postPatch =
|
||||||
|
''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace "set(Boost_USE_STATIC_LIBS on)" "" \
|
||||||
|
--replace "/usr/include/botan" "${botan}/include/botan" \
|
||||||
|
--replace "libopus.a" "libopus.so" \
|
||||||
|
--replace "libsnappy.a" "libsnappy.so" \
|
||||||
|
--replace "libbotan-1.10.a" "libbotan-1.10.so.0"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib;
|
||||||
|
{ description = "Grass computing platform";
|
||||||
|
homepage = http://firestr.com/;
|
||||||
|
license = licenses.gpl3;
|
||||||
|
maintainers = [ maintainers.emery ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/src/message/master_post.cpp b/src/message/master_post.cpp
|
||||||
|
index c3a5ea9..7c821b9 100644
|
||||||
|
--- a/src/message/master_post.cpp
|
||||||
|
+++ b/src/message/master_post.cpp
|
||||||
|
@@ -56,7 +56,7 @@ namespace fire
|
||||||
|
|
||||||
|
metadata::encryption_type to_message_encryption_type(sc::encryption_type s)
|
||||||
|
{
|
||||||
|
- metadata::encryption_type r;
|
||||||
|
+ metadata::encryption_type r = metadata::encryption_type::asymmetric;
|
||||||
|
switch(s)
|
||||||
|
{
|
||||||
|
case sc::encryption_type::plaintext: r = metadata::encryption_type::plaintext; break;
|
|
@ -10777,6 +10777,11 @@ let
|
||||||
libXfixes libXinerama libXrender libXt;
|
libXfixes libXinerama libXrender libXt;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
firestr = callPackage ../applications/networking/p2p/firestr
|
||||||
|
{ boost = boost155;
|
||||||
|
inherit (xlibs) libXScrnSaver;
|
||||||
|
};
|
||||||
|
|
||||||
flac = callPackage ../applications/audio/flac { };
|
flac = callPackage ../applications/audio/flac { };
|
||||||
|
|
||||||
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
|
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
|
||||||
|
|
Loading…
Reference in New Issue