diff options
author | Ken Micklas <ken.micklas@obsidian.systems> | 2018-04-16 19:55:33 -0400 |
---|---|---|
committer | Ken Micklas <ken.micklas@obsidian.systems> | 2018-04-19 11:39:07 -0400 |
commit | b1a8894a1cd386319f771998de417ce0a4a75b7c (patch) | |
tree | ec1a3d2fe37a02ee68aba2a3aea62be4a959229f | |
parent | 60771af5b6fc183aa354ed95e4df32c497382414 (diff) |
wrapBintoolsWith: Allow overriding extraBuildCommands
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b074a5572dd0..56064138ac11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6916,15 +6916,14 @@ with pkgs; libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; }; - wrapBintoolsWith = { bintools, libc }: bintoolsWrapperFun { + wrapBintoolsWith = { bintools, libc, extraBuildCommands ? "" }: bintoolsWrapperFun { nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false; nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false; nativePrefix = stdenv.cc.nativePrefix or ""; noLibc = (libc == null); - inherit bintools libc; - extraBuildCommands = ""; + inherit bintools libc extraBuildCommands; }; # prolog |