diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-07 00:15:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 00:15:18 +0000 |
| commit | 5a5272f97cbc3a25ed2718400c984b781f568eb7 (patch) | |
| tree | 803fa93ed09efb6d09276acd9f299ea9a0efbed5 /pkgs/os-specific/bsd/netbsd/default.nix | |
| parent | 430ac9b8303638aef0e45316d469b6312858a74d (diff) | |
| parent | 1470b9bc1856a498287ec927fe70fe97f2c26620 (diff) | |
| download | nixpkgs-5a5272f97cbc3a25ed2718400c984b781f568eb7.tar nixpkgs-5a5272f97cbc3a25ed2718400c984b781f568eb7.tar.gz nixpkgs-5a5272f97cbc3a25ed2718400c984b781f568eb7.tar.bz2 nixpkgs-5a5272f97cbc3a25ed2718400c984b781f568eb7.tar.lz nixpkgs-5a5272f97cbc3a25ed2718400c984b781f568eb7.tar.xz nixpkgs-5a5272f97cbc3a25ed2718400c984b781f568eb7.tar.zst nixpkgs-5a5272f97cbc3a25ed2718400c984b781f568eb7.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/bsd/netbsd/default.nix')
| -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 9e0b734c817..d53a1afe5e6 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; |