git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65213 from tobim/pkgsStatic/enhance

pkgsStatic: improve usability

commitc0fe97b12eca6bc76cdddfaab15149c6e17f339c authorMatthew Bauer <mjbauer95@gmail.com> dateTue 30 Jul 2019, 16:30 (7 years ago) parent576c04abb71bb1
2 files changed+24−2
pkgs/stdenv/adapters.nix+13 pkgs/top-level/static.nix+11−2
pkgs/stdenv/adapters.nix+13
@@ -62,8 +62,21 @@ rec {
6262 ];
6363 mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ];
6464 });
65+ static = true;
6566 };
6667
68+
69+ /* Modify a stdenv so that all buildInputs are implicitly propagated to
70+ consuming derivations
71+ */
72+ propagateBuildInputs = stdenv: stdenv //
73+ { mkDerivation = args: stdenv.mkDerivation (args // {
74+ propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ (args.buildInputs or []);
75+ buildInputs = [];
76+ });
77+ };
78+
79+
6780 /* Modify a stdenv so that the specified attributes are added to
6881 every derivation returned by its mkDerivation function.
6982
pkgs/top-level/static.nix+11−2
@@ -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