diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 18:36:40 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 18:36:40 +0000 |
| commit | ef328622e0dbcdd28f8a42481633ff8db5db8f10 (patch) | |
| tree | 970d5841308555d6fe14038de4ec1d8d2a0191ea /pkgs/os-specific | |
| parent | 234446a447e9a3ea8a436183eb1268100067a884 (diff) | |
cctools, darwin biutils: Use pname and version
Diffstat (limited to 'pkgs/os-specific')
| -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 9f9a0c7472475..e31f9b91f97d9 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 ff8f3eb5e265d..cb49bd023cea9 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 { |