diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-08-19 00:02:01 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-19 00:02:01 +0000 |
commit | 599a736772d17e629618332d2ab70f97ac286096 (patch) | |
tree | 1d909c09f662455dc053731b061d5ff611913d3c /pkgs/top-level/static.nix | |
parent | d3795a31f1dc4cad945431bc15ada36a48a915ba (diff) | |
parent | 1edd5e2f251e089e84ed7d5cb15cb21f25b3a28c (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level/static.nix')
-rw-r--r-- | pkgs/top-level/static.nix | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 55bba46c76221..73fe6dbc8363a 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -35,9 +35,6 @@ self: super: let }; staticAdapters = - # makeStaticDarwin must go first so that the extraBuildInputs - # override does not recreate mkDerivation, removing subsequent - # adapters. optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin ++ [ makeStaticLibraries propagateBuildInputs ] @@ -80,30 +77,9 @@ self: super: let }); }; - llvmStaticAdapter = llvmPackages: - llvmPackages // { - stdenv = foldl (flip id) llvmPackages.stdenv staticAdapters; - libcxxStdenv = foldl (flip id) llvmPackages.libcxxStdenv staticAdapters; - }; - in { stdenv = foldl (flip id) super.stdenv staticAdapters; - gcc49Stdenv = foldl (flip id) super.gcc49Stdenv staticAdapters; - gcc6Stdenv = foldl (flip id) super.gcc6Stdenv staticAdapters; - gcc7Stdenv = foldl (flip id) super.gcc7Stdenv staticAdapters; - gcc8Stdenv = foldl (flip id) super.gcc8Stdenv staticAdapters; - gcc9Stdenv = foldl (flip id) super.gcc9Stdenv staticAdapters; - - llvmPackages_5 = llvmStaticAdapter super.llvmPackages_5; - llvmPackages_6 = llvmStaticAdapter super.llvmPackages_6; - llvmPackages_7 = llvmStaticAdapter super.llvmPackages_7; - llvmPackages_8 = llvmStaticAdapter super.llvmPackages_8; - llvmPackages_9 = llvmStaticAdapter super.llvmPackages_9; - llvmPackages_10 = llvmStaticAdapter super.llvmPackages_10; - llvmPackages_11 = llvmStaticAdapter super.llvmPackages_11; - llvmPackages_12 = llvmStaticAdapter super.llvmPackages_12; - boost = super.boost.override { # Don’t use new stdenv for boost because it doesn’t like the # --disable-shared flag |