Skip to content

Commit

Permalink
Try remove MHD
Browse files Browse the repository at this point in the history
  • Loading branch information
tvorogme committed Jan 9, 2024
1 parent 6b750f7 commit 819bc98
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
if !staticExternalDeps then [
openssl
zlib
libmicrohttpd
libsodium
secp256k1
] else
Expand All @@ -39,7 +38,6 @@
(zlib.override { shared = false; }).dev
]
++ optionals (!stdenv.isDarwin) [
pkgsStatic.libmicrohttpd.dev
(pkgsStatic.libsodium.overrideAttrs (oldAttrs: {
# https://github.com/jedisct1/libsodium/issues/292#issuecomment-137135369
configureFlags = oldAttrs.configureFlags ++ [ " --disable-pie" ];
Expand All @@ -48,7 +46,7 @@
pkgsStatic.secp256k1
]
++ optionals stdenv.isDarwin [ (libiconv.override { enableStatic = true; enableShared = false; }) ]
++ optionals stdenv.isDarwin (forEach [ libmicrohttpd.dev libsodium.dev secp256k1 gmp.dev nettle.dev (gnutls.override { withP11-kit = false; }).dev libtasn1.dev libidn2.dev libunistring.dev gettext ] (x: x.overrideAttrs(oldAttrs: rec { configureFlags = (oldAttrs.configureFlags or []) ++ [ "--enable-static" "--disable-shared" ]; dontDisableStatic = true; })))
++ optionals stdenv.isDarwin (forEach [ libsodium.dev secp256k1 gmp.dev nettle.dev (gnutls.override { withP11-kit = false; }).dev libtasn1.dev libidn2.dev libunistring.dev gettext ] (x: x.overrideAttrs(oldAttrs: rec { configureFlags = (oldAttrs.configureFlags or []) ++ [ "--enable-static" "--disable-shared" ]; dontDisableStatic = true; })))
++ optionals staticGlibc [ glibc.static ];

dontAddStaticConfigureFlags = stdenv.isDarwin;
Expand Down

0 comments on commit 819bc98

Please sign in to comment.