public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

certificate-transparency: clean up and use newer clang

Browse Source
This commit is contained in:
Robin Gloster 2016-02-25 01:27:43 +00:00
parent 56ceca9d46
commit 0f4ecfad68
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkgs/servers/certificate-transparency/default.nix
View File

@ -1,4 +1,7 @@
{ stdenv, pkgs, ...}: { stdenv, fetchFromGitHub, autoreconfHook, clang, pkgconfig
, glog, gmock, gtest, google-gflags, gperftools, json_c, leveldb
, libevent, libevhtp, openssl, protobuf, sqlite
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "certificate-transparency-${version}"; name = "certificate-transparency-${version}";
@ -6,15 +9,7 @@ stdenv.mkDerivation rec {
version = "2016-01-14"; version = "2016-01-14";
rev = "250672b5aef3666edbdfc9a75b95a09e7a57ed08"; rev = "250672b5aef3666edbdfc9a75b95a09e7a57ed08";
meta = with stdenv.lib; { src = fetchFromGitHub {
homepage = https://www.certificate-transparency.org/;
description = "Auditing for TLS certificates.";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ philandstuff ];
};
src = pkgs.fetchFromGitHub {
owner = "google"; owner = "google";
repo = "certificate-transparency"; repo = "certificate-transparency";
rev = rev; rev = rev;
@ -22,13 +17,13 @@ stdenv.mkDerivation rec {
}; };
# need to disable regex support in evhtp or building will fail # need to disable regex support in evhtp or building will fail
libevhtp_without_regex = stdenv.lib.overrideDerivation pkgs.libevhtp libevhtp_without_regex = stdenv.lib.overrideDerivation libevhtp
(oldAttrs: { (oldAttrs: {
cmakeFlags="-DEVHTP_DISABLE_REGEX:STRING=ON -DCMAKE_C_FLAGS:STRING=-fPIC"; cmakeFlags = "-DEVHTP_DISABLE_REGEX:STRING=ON";
}); });
buildInputs = with pkgs; [ buildInputs = [
autoconf automake clang_34 pkgconfig autoreconfHook clang pkgconfig
glog gmock google-gflags gperftools gtest json_c leveldb glog gmock google-gflags gperftools gtest json_c leveldb
libevent libevhtp_without_regex openssl protobuf sqlite libevent libevhtp_without_regex openssl protobuf sqlite
]; ];
@ -37,21 +32,24 @@ stdenv.mkDerivation rec {
./protobuf-include-from-env.patch ./protobuf-include-from-env.patch
]; ];
doCheck = false; configureFlags = [
"CC=clang"
preConfigure = '' "CXX=clang++"
./autogen.sh "GMOCK_DIR=${gmock}"
configureFlagsArray=( "GTEST_DIR=${gtest}"
CC=clang ];
CXX=clang++
GMOCK_DIR=${pkgs.gmock}
GTEST_DIR=${pkgs.gtest}
)
'';
# the default Makefile constructs BUILD_VERSION from `git describe` # the default Makefile constructs BUILD_VERSION from `git describe`
# which isn't available in the nix build environment # which isn't available in the nix build environment
makeFlags = "BUILD_VERSION=${version}-${rev}"; makeFlags = "BUILD_VERSION=${version}-${rev}";
protocFlags = "-I ${pkgs.protobuf}/include"; protocFlags = "-I ${protobuf}/include";
meta = with stdenv.lib; {
homepage = https://www.certificate-transparency.org/;
description = "Auditing for TLS certificates.";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ philandstuff ];
};
} }