@@ -12,7 +12,8 @@
1212
1313self: super: let
1414 inherit (super.stdenvAdapters) makeStaticBinaries
15− makeStaticLibraries;
15+ makeStaticLibraries
16+ propagateBuildInputs;
1617 inherit (super.lib) foldl optional flip id composeExtensions;
1718 inherit (super) makeSetupHook;
1819
@@ -30,7 +31,7 @@ self: super: let
3031 });
3132 };
3233
33− staticAdapters = [ makeStaticLibraries ]
34+ staticAdapters = [ makeStaticLibraries propagateBuildInputs ]
3435
3536 # Apple does not provide a static version of libSystem or crt0.o
3637 # So we can’t build static binaries without extensive hacks.
@@ -53,6 +54,14 @@ self: super: let
5354
5455in {
5556 stdenv = foldl (flip id) super.stdenv staticAdapters;
57+ gcc49Stdenv = foldl (flip id) super.gcc49Stdenv staticAdapters;
58+ gcc5Stdenv = foldl (flip id) super.gcc5Stdenv staticAdapters;
59+ gcc6Stdenv = foldl (flip id) super.gcc6Stdenv staticAdapters;
60+ gcc7Stdenv = foldl (flip id) super.gcc7Stdenv staticAdapters;
61+ gcc8Stdenv = foldl (flip id) super.gcc8Stdenv staticAdapters;
62+ gcc9Stdenv = foldl (flip id) super.gcc9Stdenv staticAdapters;
63+ clangStdenv = foldl (flip id) super.clangStdenv staticAdapters;
64+ libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters;
5665
5766 haskell = super.haskell // {
5867 packageOverrides = composeExtensions