From cdb80175853c2e743e2d5c7243af06bd667d38e8 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 16 Jul 2024 22:12:42 -0700 Subject: [PATCH] freebsd.mkDerivation: re-add missing hunk --- pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index ec4b698116b9..3ff7258734ef 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -2,8 +2,10 @@ lib, stdenv, stdenvNoCC, + stdenvNoLibs, + overrideCC, + buildPackages, versionData, - writeText, patches, compatIfNeeded, freebsd-lib, @@ -21,7 +23,15 @@ lib.makeOverridable ( attrs: let - stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + stdenv' = + if attrs.noCC or false then + stdenvNoCC + else if attrs.noLibc or false then + stdenvNoLibs + else if attrs.noLibcxx or false then + overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx + else + stdenv; in stdenv'.mkDerivation ( rec {