diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-07-30 16:30:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 16:30:27 -0400 |
| commit | c0fe97b12eca6bc76cdddfaab15149c6e17f339c (patch) | |
| tree | d0ce3fd4b493d43db5d31d65790852e3b2b6008b /pkgs/top-level | |
| parent | 576c04a9a5f5e10e9c059b14b767f376b0aaae97 (diff) | |
| parent | bb71bb15ce30dfc453648ac8979f938b9b3aeed7 (diff) | |
| download | nixlib-c0fe97b12eca6bc76cdddfaab15149c6e17f339c.tar nixlib-c0fe97b12eca6bc76cdddfaab15149c6e17f339c.tar.gz nixlib-c0fe97b12eca6bc76cdddfaab15149c6e17f339c.tar.bz2 nixlib-c0fe97b12eca6bc76cdddfaab15149c6e17f339c.tar.lz nixlib-c0fe97b12eca6bc76cdddfaab15149c6e17f339c.tar.xz nixlib-c0fe97b12eca6bc76cdddfaab15149c6e17f339c.tar.zst nixlib-c0fe97b12eca6bc76cdddfaab15149c6e17f339c.zip | |
Merge pull request #65213 from tobim/pkgsStatic/enhance
pkgsStatic: improve usability
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/static.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 476ad9de3e95..108c6006fb64 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -12,7 +12,8 @@ self: super: let inherit (super.stdenvAdapters) makeStaticBinaries - makeStaticLibraries; + makeStaticLibraries + propagateBuildInputs; inherit (super.lib) foldl optional flip id composeExtensions; inherit (super) makeSetupHook; @@ -30,7 +31,7 @@ self: super: let }); }; - staticAdapters = [ makeStaticLibraries ] + staticAdapters = [ makeStaticLibraries propagateBuildInputs ] # Apple does not provide a static version of libSystem or crt0.o # So we can’t build static binaries without extensive hacks. @@ -53,6 +54,14 @@ self: super: let in { stdenv = foldl (flip id) super.stdenv staticAdapters; + gcc49Stdenv = foldl (flip id) super.gcc49Stdenv staticAdapters; + gcc5Stdenv = foldl (flip id) super.gcc5Stdenv 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; + clangStdenv = foldl (flip id) super.clangStdenv staticAdapters; + libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters; haskell = super.haskell // { packageOverrides = composeExtensions |