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

pkgsStatic: fix curl, boost, openssl and libsodium

Browse Source
This commit is contained in:
Domen Kožar 2019-09-29 12:01:21 +02:00
parent afeea609ab
commit 3a6efadba0
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libsodium/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
separateDebugInfo = stdenv.isLinux; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -115,7 +115,9 @@ in {
static = true; static = true;
}; };
openblas = super.openblas.override { enableStatic = true; }; openblas = super.openblas.override { enableStatic = true; };
openssl = super.openssl.override { nix = super.nix.override { withAWS = false; };
# openssl 1.1 doesn't compile
openssl = super.openssl_1_0_2.override {
static = true; static = true;
# Don’t use new stdenv for openssl because it doesn’t like the # Don’t use new stdenv for openssl because it doesn’t like the
@ -125,6 +127,10 @@ in {
boost = super.boost.override { boost = super.boost.override {
enableStatic = true; enableStatic = true;
enableShared = false; enableShared = false;
# Don’t use new stdenv for boost because it doesn’t like the
# --disable-shared flag
stdenv = super.stdenv;
}; };
gmp = super.gmp.override { gmp = super.gmp.override {
withStatic = true; withStatic = true;
@ -159,6 +165,11 @@ in {
}; };
}; };
curl = super.curl.override {
# a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039
gssSupport = false;
};
brotli = super.brotli.override { brotli = super.brotli.override {
staticOnly = true; staticOnly = true;
}; };