diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:45:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:56:01 +0000 |
| commit | eb7dadee9c0f903f1152f8dd4165453bfa48ccf4 (patch) | |
| tree | a6bd66dcbec895aae167465672af08a1ca70f089 /nixpkgs/pkgs/development/libraries/boringssl | |
| parent | 3879b925f5dae3a0eb5c98b10c1ac5a0e4d729a3 (diff) | |
| parent | 683c68232e91f76386db979c461d8fbe2a018782 (diff) | |
| download | nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.gz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.bz2 nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.lz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.xz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.zst nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.zip | |
Merge commit '683c68232e91f76386db979c461d8fbe2a018782'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/boringssl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/boringssl/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix index 67e2794c8a29..20524cf179cf 100644 --- a/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -3,24 +3,23 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation { pname = "boringssl"; - version = "2017-02-23"; + version = "2019-12-04"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "be2ee342d3781ddb954f91f8a7e660c6f59e87e5"; - sha256 = "022zq7wlkhrg6al7drr3555lam3zw5bb10ylf9mznp83s854f975"; + rev = "243b5cc9e33979ae2afa79eaa4e4c8d59db161d4"; + sha256 = "1ak27dln0zqy2vj4llqsb99g03sk0sg25wlp09b58cymrh3gccvl"; }; - buildInputs = [ cmake perl go ]; + nativeBuildInputs = [ cmake perl go ]; enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ]; installPhase = '' - mkdir -p $out/bin $out/include $out/lib + mkdir -p $bin/bin $out/include $out/lib - mv tool/bssl $out/bin + mv tool/bssl $bin/bin mv ssl/libssl.a $out/lib mv crypto/libcrypto.a $out/lib @@ -29,6 +28,8 @@ stdenv.mkDerivation { mv ../include/openssl $out/include ''; + outputs = [ "out" "bin" ]; + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "https://boringssl.googlesource.com"; |