libressl: add static override

wip/yesman
Matthew Bauer 5 years ago
parent 8f01848075
commit 37744d2c36
  1. 5
      pkgs/development/libraries/libressl/default.nix
  2. 3
      pkgs/top-level/static.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch }:
{ stdenv, fetchurl, lib, cmake, cacert, fetchpatch, buildShared ? true }:
let
@ -15,13 +15,12 @@ let
cmakeFlags = [
"-DENABLE_NC=ON"
"-DBUILD_SHARED_LIBS=ON"
# Ensure that the output libraries do not require an executable stack.
# Without this define, assembly files in libcrypto do not include a
# .note.GNU-stack section, and if that section is missing from any object,
# the linker will make the stack executable.
"-DCMAKE_C_FLAGS=-DHAVE_GNU_STACK"
];
] ++ lib.optional buildShared "-DBUILD_SHARED_LIBS=ON";
# The autoconf build is broken as of 2.9.1, resulting in the following error:
# libressl-2.9.1/tls/.libs/libtls.a', needed by 'handshake_table'.

@ -148,6 +148,9 @@ in {
enableShared = false;
enableStatic = true;
};
libressl = super.libressl.override {
buildShared = false;
};
darwin = super.darwin // {
libiconv = super.darwin.libiconv.override {

Loading…
Cancel
Save