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

Merge pull request #104031 from DavHau/nix-static

Browse Source
This commit is contained in:
Sandro 2021-04-01 13:45:44 +02:00 committed by GitHub
commit b738139414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View File

@ -29531,6 +29531,8 @@ in
nixUnstable nixUnstable
nixFlakes; nixFlakes;
nixStatic = pkgsStatic.nix;
nixops = callPackage ../tools/package-management/nixops { }; nixops = callPackage ../tools/package-management/nixops { };
nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { });

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

@ -93,27 +93,37 @@ 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 {
# 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 { 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;
};
} }