diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-11-25 22:00:13 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-11-25 22:00:13 -0500 |
| commit | 08d6c4019d2def8d14435da2c371accdfc7b05ef (patch) | |
| tree | a98b9671beb5e033049524bf062f2a751da7c903 /pkgs/os-specific/darwin | |
| parent | 0c6a0c817aad863a58d0bf0c8dc55da3c611805a (diff) | |
| parent | 6ec5e745dc4f9dc5f321989fef4a5fa66a21c7b2 (diff) | |
| download | nixpkgs-08d6c4019d2def8d14435da2c371accdfc7b05ef.tar nixpkgs-08d6c4019d2def8d14435da2c371accdfc7b05ef.tar.gz nixpkgs-08d6c4019d2def8d14435da2c371accdfc7b05ef.tar.bz2 nixpkgs-08d6c4019d2def8d14435da2c371accdfc7b05ef.tar.lz nixpkgs-08d6c4019d2def8d14435da2c371accdfc7b05ef.tar.xz nixpkgs-08d6c4019d2def8d14435da2c371accdfc7b05ef.tar.zst nixpkgs-08d6c4019d2def8d14435da2c371accdfc7b05ef.zip | |
Merge remote-tracking branch 'origin/staging' into dnicponski/scratch/update_darwin_cctools
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/binutils/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 9f9a0c74724..e31f9b91f97 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -14,7 +14,8 @@ in # TODO: loop over targetPrefixed binaries too stdenv.mkDerivation { - name = "${targetPrefix}cctools-binutils-darwin"; + pname = "${targetPrefix}cctools-binutils-darwin"; + inherit (cctools) version; outputs = [ "out" "info" "man" ]; buildCommand = '' mkdir -p $out/bin $out/include diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index f7c67df9448..6b8f26c8e66 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -18,7 +18,7 @@ assert (!stdenv.hostPlatform.isDarwin) -> maloader != null; let baseParams = rec { - name = "${targetPrefix}cctools-port-${version}"; + name = "${targetPrefix}cctools-port"; version = "927.0.2"; src = fetchFromGitHub { |