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

pkgsStatic: refactor to alphanumerical order

Browse Source
This commit is contained in:
DavHau 2021-03-23 12:19:50 +07:00
parent 6b774d4ff6
commit 2f41b6e43c
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,32 +93,36 @@ in {
clangStdenv = foldl (flip id) super.clangStdenv staticAdapters; clangStdenv = foldl (flip id) super.clangStdenv staticAdapters;
libcxxStdenv = foldl (flip id) super.libcxxStdenv 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 { boost = super.boost.override {
# Don’t use new stdenv for boost because it doesn’t like the # Don’t use new stdenv for boost because it doesn’t like the
# --disable-shared flag # --disable-shared flag
stdenv = super.stdenv; stdenv = super.stdenv;
}; };
curl = super.curl.override { curl = super.curl.override {
brotliSupport = false; brotliSupport = false;
# disable gss becuase of: undefined reference to `k5_bcmp' # disable gss becuase of: undefined reference to `k5_bcmp'
gssSupport = false; 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 { perl = super.perl.override {
# Don’t use new stdenv zlib because # Don’t use new stdenv zlib because
# it doesn’t like the --disable-shared flag # it doesn’t like the --disable-shared flag
stdenv = super.stdenv; stdenv = super.stdenv;
}; };
ocaml-ng = self.lib.mapAttrs (_: set: zlib = super.zlib.override {
if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set # Don’t use new stdenv zlib because
) super.ocaml-ng; # it doesn’t like the --disable-shared flag
stdenv = super.stdenv;
};
} }