ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 12:08:02 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #327815 from rhelmot/fix/freebsd

Browse Source 
freebsd.mkDerivation: re-add missing hunk
This commit is contained in:
Jörg Thalheim 2024-07-19 21:50:39 +02:00 committed by GitHub
commit 96d0f7b826
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
View File

@ -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 {