diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-26 11:43:30 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-13 16:08:18 -0500 |
| commit | 2bba92906231ae021b4778986419320c3792ce48 (patch) | |
| tree | eb6f8526328212ec104c8851a18d93b804722099 /pkgs/top-level/darwin-packages.nix | |
| parent | 8e557ed2c58e6ce48a8d05dbc57ef84e98b4cecd (diff) | |
| download | nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar.gz nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar.bz2 nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar.lz nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar.xz nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar.zst nixpkgs-2bba92906231ae021b4778986419320c3792ce48.zip | |
bintools-wrapper: Import separately from cc-wrapper
Diffstat (limited to 'pkgs/top-level/darwin-packages.nix')
| -rw-r--r-- | pkgs/top-level/darwin-packages.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 32d540a8f96..f252a63f8c3 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -10,8 +10,14 @@ in apple_sdk = callPackage ../os-specific/darwin/apple-sdk { }; - binutils = callPackage ../os-specific/darwin/binutils { - inherit (darwin) cctools; + binutils = pkgs.wrapBintoolsWith { + libc = + if pkgs.targetPlatform != pkgs.hostPlatform + then pkgs.libcCross + else pkgs.stdenv.cc.libc; + bintools = callPackage ../os-specific/darwin/binutils { + inherit (darwin) cctools; + }; }; cctools = callPackage ../os-specific/darwin/cctools/port.nix { |