diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-15 06:05:40 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-15 06:05:40 +0000 |
commit | 8b35f0c117df2d8d2c7c6844733185af91fad06b (patch) | |
tree | 676aaba5ea6bdaa32fb11739fb51997eda8f31a0 /lib/systems | |
parent | b49be812b505e4afe8ea75056e7915b021615192 (diff) | |
parent | a97f6bbcc40b1b1b5baeb38ff83defe0c5b47712 (diff) | |
download | nixpkgs-8b35f0c117df2d8d2c7c6844733185af91fad06b.tar nixpkgs-8b35f0c117df2d8d2c7c6844733185af91fad06b.tar.gz nixpkgs-8b35f0c117df2d8d2c7c6844733185af91fad06b.tar.bz2 nixpkgs-8b35f0c117df2d8d2c7c6844733185af91fad06b.tar.lz nixpkgs-8b35f0c117df2d8d2c7c6844733185af91fad06b.tar.xz nixpkgs-8b35f0c117df2d8d2c7c6844733185af91fad06b.tar.zst nixpkgs-8b35f0c117df2d8d2c7c6844733185af91fad06b.zip |
Merge master into staging-next
Diffstat (limited to 'lib/systems')
-rw-r--r-- | lib/systems/examples.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 02958f31ec8..13779a9b0cf 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -250,9 +250,18 @@ rec { # BSDs - amd64-netbsd = { + # Deprecate + amd64-netbsd = x86_64-netbsd; + + x86_64-netbsd = { + config = "x86_64-unknown-netbsd"; + libc = "nblibc"; + }; + + x86_64-netbsd-llvm = { config = "x86_64-unknown-netbsd"; libc = "nblibc"; + useLLVM = true; }; # |