diff options
author | Emery Hemingway <emery@vfemail.net> | 2015-04-26 14:51:50 -0400 |
---|---|---|
committer | Emery Hemingway <emery@vfemail.net> | 2015-04-26 14:57:22 -0400 |
commit | 8b7a05cba615748379a81db3c3e82e7e419565ff (patch) | |
tree | ae176a2b40f65a9ed7b162056937b8f4699f01af /pkgs | |
parent | 52b47982ff3e7530d304748e45433494a78214eb (diff) | |
download | nixlib-8b7a05cba615748379a81db3c3e82e7e419565ff.tar nixlib-8b7a05cba615748379a81db3c3e82e7e419565ff.tar.gz nixlib-8b7a05cba615748379a81db3c3e82e7e419565ff.tar.bz2 nixlib-8b7a05cba615748379a81db3c3e82e7e419565ff.tar.lz nixlib-8b7a05cba615748379a81db3c3e82e7e419565ff.tar.xz nixlib-8b7a05cba615748379a81db3c3e82e7e419565ff.tar.zst nixlib-8b7a05cba615748379a81db3c3e82e7e419565ff.zip |
firestr: initial package at 0.8
http://firestr.com/
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/p2p/firestr/default.nix | 35 | ||||
-rw-r--r-- | pkgs/applications/networking/p2p/firestr/return.patch | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 53 insertions, 0 deletions
diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix new file mode 100644 index 000000000000..49d15f59c7fa --- /dev/null +++ b/pkgs/applications/networking/p2p/firestr/default.nix @@ -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; + }; +} diff --git a/pkgs/applications/networking/p2p/firestr/return.patch b/pkgs/applications/networking/p2p/firestr/return.patch new file mode 100644 index 000000000000..c3e469ae92b0 --- /dev/null +++ b/pkgs/applications/networking/p2p/firestr/return.patch @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 247e5db85469..682b99cdf430 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10775,6 +10775,11 @@ let libXfixes libXinerama libXrender libXt; }; + firestr = callPackage ../applications/networking/p2p/firestr + { boost = boost155; + inherit (xlibs) libXScrnSaver; + }; + flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { |