diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84a839a97ab..e996bc6c49e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29531,6 +29531,8 @@ in nixUnstable nixFlakes; + nixStatic = pkgsStatic.nix; + nixops = callPackage ../tools/package-management/nixops { }; nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index b3fe7bf8c94..3cddcde603d 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -93,27 +93,37 @@ in { clangStdenv = foldl (flip id) super.clangStdenv staticAdapters; libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters; - zlib = super.zlib.override { - # Don’t use new stdenv zlib because - # it doesn’t like the --disable-shared flag - stdenv = super.stdenv; - }; - openssl = super.openssl_1_1.overrideAttrs (o: { - # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. - configureFlags = (removeUnknownConfigureFlags o.configureFlags); - }); boost = super.boost.override { # Don’t use new stdenv for boost because it doesn’t like the # --disable-shared flag stdenv = super.stdenv; }; + + curl = super.curl.override { + # brotli doesn't build static (Mar. 2021) + brotliSupport = false; + # disable gss becuase of: undefined reference to `k5_bcmp' + gssSupport = false; + }; + + ocaml-ng = self.lib.mapAttrs (_: set: + if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set + ) super.ocaml-ng; + + openssl = super.openssl_1_1.overrideAttrs (o: { + # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. + configureFlags = (removeUnknownConfigureFlags o.configureFlags); + }); + perl = super.perl.override { # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag stdenv = super.stdenv; }; - ocaml-ng = self.lib.mapAttrs (_: set: - if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set - ) super.ocaml-ng; + zlib = super.zlib.override { + # Don’t use new stdenv zlib because + # it doesn’t like the --disable-shared flag + stdenv = super.stdenv; + }; }