Merge remote-tracking branch 'upstream/master' into HEAD
This commit is contained in:
commit
c0ff5c7b7a
26
pkgs/development/libraries/marl/default.nix
Normal file
26
pkgs/development/libraries/marl/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ stdenv, cmake, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marl";
|
||||
version = "1.0.0"; # Based on marl's CHANGES.md
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
sha256 = "0pnbarbyv82h05ckays2m3vgxzdhpcpg59bnzsddlb5v7rqhw51w";
|
||||
rev = "40209e952f5c1f3bc883d2b7f53b274bd454ca53";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# Turn on the flag to install after building the library.
|
||||
cmakeFlags = ["-DMARL_INSTALL=ON"];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/google/marl";
|
||||
description = "A hybrid thread / fiber task scheduler written in C++ 11";
|
||||
platforms = platforms.all;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ breakds ];
|
||||
};
|
||||
}
|
@ -2376,6 +2376,8 @@ in
|
||||
|
||||
mapproxy = callPackage ../applications/misc/mapproxy { };
|
||||
|
||||
marl = callPackage ../development/libraries/marl {};
|
||||
|
||||
marlin-calc = callPackage ../tools/misc/marlin-calc {};
|
||||
|
||||
masscan = callPackage ../tools/security/masscan {
|
||||
|
Loading…
Reference in New Issue
Block a user