Commit 6dff6329 authored by sternenseemann's avatar sternenseemann Committed by Alyssa Ross
Browse files

netbsd: take fetchcvs from buildPackages to fix eval 

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
00a2084a 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 #119323.
parent 6f236fcf

pkgs/os-specific/bsd/netbsd/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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;