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

libressl: add static override

Browse Source
This commit is contained in:
Matthew Bauer 2019-09-19 12:37:34 -04:00
parent 8f01848075
commit 37744d2c36
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libressl/default.nix
View File

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

3
pkgs/top-level/static.nix
View File

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