diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-09-25 19:35:03 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-09-25 19:35:03 +0200 |
| commit | 1bd6ee65561746b5c03c32b9f6cc67148a0463c3 (patch) | |
| tree | 49be51c733a9639f4a4a0499e7adc08920d614a8 /pkgs | |
| parent | ad0b63265cb9b9446396dd5876d25fcb792d4f05 (diff) | |
| download | nixpkgs-1bd6ee65561746b5c03c32b9f6cc67148a0463c3.tar nixpkgs-1bd6ee65561746b5c03c32b9f6cc67148a0463c3.tar.gz nixpkgs-1bd6ee65561746b5c03c32b9f6cc67148a0463c3.tar.bz2 nixpkgs-1bd6ee65561746b5c03c32b9f6cc67148a0463c3.tar.lz nixpkgs-1bd6ee65561746b5c03c32b9f6cc67148a0463c3.tar.xz nixpkgs-1bd6ee65561746b5c03c32b9f6cc67148a0463c3.tar.zst nixpkgs-1bd6ee65561746b5c03c32b9f6cc67148a0463c3.zip | |
Adding umurmur and protobuf-c.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/umurmur/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/protobufc/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 46 insertions, 0 deletions
diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix new file mode 100644 index 00000000000..7c731874a5f --- /dev/null +++ b/pkgs/applications/networking/umurmur/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, openssl, protobufc, libconfig }: + +stdenv.mkDerivation rec { + name = "umurmur-0.2.10"; + + src = fetchurl { + url = "http://umurmur.googlecode.com/files/${name}.tar.gz"; + sha256 = "0c990jvm73a6lajr1qlzw0p6nkshkh2nqwjmz2sq79pj0hm9ckvy"; + }; + + buildInputs = [ openssl protobufc libconfig ]; + + configureFlags = "--with-ssl=openssl"; + + meta = { + description = "Minimalistic Murmur (Mumble server)"; + license = "BSD"; + homepage = http://code.google.com/p/umurmur/; + }; +} diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix new file mode 100644 index 00000000000..58c639ee604 --- /dev/null +++ b/pkgs/development/libraries/protobufc/default.nix @@ -0,0 +1,22 @@ +{ fetchurl, stdenv, zlib, protobuf }: + +stdenv.mkDerivation rec { + name = "protobuf-c-0.15"; + + src = fetchurl { + url = "http://protobuf-c.googlecode.com/files/${name}.tar.gz"; + sha256 = "0dh0180lzqk6n1r0qk38kgdy4x15mpkg5j4g2r31qhx52f757jwg"; + }; + + buildInputs = [ protobuf ]; + + doCheck = true; + + meta = { + description = "C bindings for Google's Protocol Buffers"; + + license = "BSD"; + + homepage = http://code.google.com/p/protobuf-c/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77fb3f4885c..f150c1bff69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4674,6 +4674,8 @@ let protobuf = callPackage ../development/libraries/protobuf { }; + protobufc = callPackage ../development/libraries/protobufc { }; + pth = callPackage ../development/libraries/pth { }; ptlib = callPackage ../development/libraries/ptlib {}; @@ -7767,6 +7769,8 @@ let libzrtpcpp = libzrtpcpp_1_6; }; + umurmur = callPackage ../applications/networking/umurmur { }; + unison = callPackage ../applications/networking/sync/unison { inherit (ocamlPackages) lablgtk; enableX11 = config.unison.enableX11 or true; |