diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-07 00:15:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 00:15:20 +0000 |
| commit | 4db56e21dcad013e9f8308445b70c90e5551c0f3 (patch) | |
| tree | f83645bc1a74af16d0ae83b17f3ef9c6cd9b274a /pkgs/os-specific/bsd | |
| parent | 8eda97c6dd7a892f55dd7544678e7724a16768cd (diff) | |
| parent | 5a5272f97cbc3a25ed2718400c984b781f568eb7 (diff) | |
| download | nixpkgs-4db56e21dcad013e9f8308445b70c90e5551c0f3.tar nixpkgs-4db56e21dcad013e9f8308445b70c90e5551c0f3.tar.gz nixpkgs-4db56e21dcad013e9f8308445b70c90e5551c0f3.tar.bz2 nixpkgs-4db56e21dcad013e9f8308445b70c90e5551c0f3.tar.lz nixpkgs-4db56e21dcad013e9f8308445b70c90e5551c0f3.tar.xz nixpkgs-4db56e21dcad013e9f8308445b70c90e5551c0f3.tar.zst nixpkgs-4db56e21dcad013e9f8308445b70c90e5551c0f3.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/bsd')
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 1d5e210f8ac..3e92cc9c951 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -96,6 +96,8 @@ in lib.makeScopeWithSplicing HAVE_LLVM = lib.versions.major (lib.getVersion stdenv'.cc.cc); } // lib.optionalAttrs (stdenv'.cc.isGNU or false) { HAVE_GCC = lib.versions.major (lib.getVersion stdenv'.cc.cc); + } // lib.optionalAttrs (stdenv'.isx86_32) { + USE_SSP = "no"; } // lib.optionalAttrs (attrs.headersOnly or false) { installPhase = "includesPhase"; dontBuild = true; |