Skip to content

Commit

Permalink
netbsd: take fetchcvs from buildPackages to fix eval
Browse files Browse the repository at this point in the history
For some reason fetchcvs was taken from the cross package set when
cross compiling netbsd.* instead of from buildPackages. I suspect that
this was no issue previously because it just could be substituted as it
only ever produced fixed output derivations. However since
00a2084 the evaluation of fetchcvs
would depend on `stdenv.cc` (via its openssh dependency). Since
netbsd.libc is required to evaluate stdenv.cc this caused a infinite
recursion when staging the cross stdenv for pkgsCross.amd64-netbsd. The
fix for this is pretty easy: Just take fetchcvs from buildPackages
explicitly instead of hoping for mkDerivation to get it right.

Resolves NixOS#119323.
  • Loading branch information
sternenseemann authored and alyssais committed Apr 14, 2021
1 parent 6f236fc commit 6dff632
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkgs/os-specific/bsd/netbsd/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, bison, flex
{ stdenv, stdenvNoCC, lib, groff, mandoc, zlib, bison, flex
, writeText, buildPackages, splicePackages, symlinkJoin }:

let
fetchNetBSD = path: version: sha256: fetchcvs {
fetchNetBSD = path: version: sha256: buildPackages.fetchcvs {
cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot";
module = "src/${path}";
inherit sha256;
Expand Down

0 comments on commit 6dff632

Please sign in to comment.