diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-09-07 12:22:33 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-09-07 12:51:21 +0200 |
| commit | ec8d41f08c95cff79ccb28132146226f4f75c6fe (patch) | |
| tree | c371a0c81a6f2e9a6a06489daf4a4e4cff393081 /pkgs/top-level/darwin-packages.nix | |
| parent | d38ee5b46c5ca7d479786a4fa40efd53dcd748ec (diff) | |
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
This reverts commit 0a944b345e89ca0096974d168f49e1c6830c3fc2, reversing
changes made to 61733ed6ccde3427016720f2e0cd191d3d95152c.
I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
Diffstat (limited to 'pkgs/top-level/darwin-packages.nix')
| -rw-r--r-- | pkgs/top-level/darwin-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index a8c8f744d8a1..32d540a8f967 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -10,9 +10,9 @@ in apple_sdk = callPackage ../os-specific/darwin/apple-sdk { }; - binutils = pkgs.wrapBinutils (callPackage ../os-specific/darwin/binutils { + binutils = callPackage ../os-specific/darwin/binutils { inherit (darwin) cctools; - }); + }; cctools = callPackage ../os-specific/darwin/cctools/port.nix { inherit (darwin) libobjc maloader; |