diff options
| -rw-r--r-- | pkgs/development/libraries/libsodium/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/static.nix | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 8c88abd2c44..a2b6ba6224e 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 6a311b4c9d2..f0ba6a09c0b 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -115,7 +115,9 @@ in { static = 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; # Don’t use new stdenv for openssl because it doesn’t like the @@ -125,6 +127,10 @@ in { boost = super.boost.override { enableStatic = true; 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 { 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 { staticOnly = true; }; |