mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-10 22:24:40 +00:00
Merge pull request #327815 from rhelmot/fix/freebsd
freebsd.mkDerivation: re-add missing hunk
This commit is contained in:
commit
96d0f7b826
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user