diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-24 18:35:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 18:35:13 -0500 |
| commit | 6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85 (patch) | |
| tree | 20539c52c68c21abea4970aac8da7592f1c6fa77 /pkgs/os-specific/darwin | |
| parent | 4f1261134ef3166910e57ec84e2fcc21279cf99d (diff) | |
| parent | ef328622e0dbcdd28f8a42481633ff8db5db8f10 (diff) | |
| download | nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar.gz nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar.bz2 nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar.lz nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar.xz nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.tar.zst nixpkgs-6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85.zip | |
Merge pull request #74065 from Ericson2314/cc-versions
compilers, binutils: Add version and pname
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 ff8f3eb5e26..cb49bd023ce 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}"; + pname = "${targetPrefix}cctools-port"; version = "895"; src = fetchFromGitHub { |