summaryrefslogtreecommitdiffstats
path: root/pkgs/top-level/stage.nix
diff options
context:
space:
mode:
authorArtemis Tosini <me@artem.ist>2024-04-27 02:22:23 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2024-05-11 21:52:07 -0400
commit06b05d2289599dd434b6991fa25685ce5cb9a136 (patch)
tree7ecb6c8ef786d99608a239f20982b4f4d423a900 /pkgs/top-level/stage.nix
parentf5710818997d3d517521bd79348f92e546bb7bbe (diff)
freebsd: Cleanup, get ready to support version 14
* Extend libc Include non-libc core libraries in the libc package. Many of these mirror libraries present in glibc on linux, such as libgcc, libraries used for iconv, and libraries used for reading kernel info (libkvm, libprocstat, libmemstat). Without this many packages outside the freebsd tree would need to be modified to include standard dependencies which would already be on the system for other packages. * Mark FreeBSD as using LLVM * Update default LLVM version FreeBSD * Use patch monolith The patchesRoot system combined with the fact that each derivation will Request specific names of patches makes it very annoying to use other FreeBSD source trees with nixpkgs. This new system allows providing one Or more entire trees of patches whose contents will be dynamically Parsed and only the relevant patches will be applied for any one Derivation. With this commit, the following knobs are available for specifying the FreeBSD source: - overriding `freebsd.versionInfo`, for picking another official supported FreeBSD release. - overriding `freebsd.source` for specifying a specific unpatched FreeBSD source tree. - overriding `freebsd.patches`, for specifying the patches to apply. Co-Authored-by: Audrey Dutcher <audrey@rhelmot.io> Co-Authored-by: John Ericson <John.Ericson@Obsidian.Systems>
Diffstat (limited to 'pkgs/top-level/stage.nix')
-rw-r--r--pkgs/top-level/stage.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 3b84026b4696..e8d4cd4a4724 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -57,9 +57,7 @@ in
, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc
# outside of the store. Thus, GCC, GFortran, & co. must always look for files
# in standard system directories (/usr/include, etc.)
- noSysDirs ? stdenv.buildPlatform.system != "x86_64-freebsd"
- && stdenv.buildPlatform.system != "i686-freebsd"
- && stdenv.buildPlatform.system != "x86_64-solaris"
+ noSysDirs ? stdenv.buildPlatform.system != "x86_64-solaris"
&& stdenv.buildPlatform.system != "x86_64-kfreebsd-gnu"
, # The configuration attribute set