dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #120283 from Ericson2314/netbsd-fewer-vars

Browse Source 
netbsd: Remove some env vars that are probably not needed.
This commit is contained in:
John Ericson 2021-04-23 20:57:18 -04:00 committed by GitHub
commit 96b2cb441c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/bsd/netbsd/default.nix
View File

@ -63,8 +63,7 @@ in lib.makeScopeWithSplicing
]; ];
buildInputs = with self; compatIfNeeded; buildInputs = with self; compatIfNeeded;
OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; HOST_SH = stdenv'.shell;
HOST_SH = "${buildPackages.bash}/bin/sh";
MACHINE_ARCH = { MACHINE_ARCH = {
i686 = "i386"; i686 = "i386";
@ -78,13 +77,6 @@ in lib.makeScopeWithSplicing
}.${stdenv'.hostPlatform.parsed.cpu.name} }.${stdenv'.hostPlatform.parsed.cpu.name}
or stdenv'.hostPlatform.parsed.cpu.name; or stdenv'.hostPlatform.parsed.cpu.name;
AR = "${stdenv'.cc.targetPrefix or ""}ar";
CC = "${stdenv'.cc.targetPrefix or ""}cc";
CPP = "${stdenv'.cc.targetPrefix or ""}cpp";
CXX = "${stdenv'.cc.targetPrefix or ""}c++";
LD = "${stdenv'.cc.targetPrefix or ""}ld";
STRIP = "${stdenv'.cc.targetPrefix or ""}strip";
BSD_PATH = attrs.path; BSD_PATH = attrs.path;
strictDeps = true; strictDeps = true;
@ -94,6 +86,9 @@ in lib.makeScopeWithSplicing
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.bsd2; license = licenses.bsd2;
}; };
} // lib.optionalAttrs stdenv'.hasCC {
# TODO should CC wrapper set this?
CPP = "${stdenv'.cc.targetPrefix}cpp";
} // lib.optionalAttrs stdenv'.isDarwin { } // lib.optionalAttrs stdenv'.isDarwin {
MKRELRO = "no"; MKRELRO = "no";
} // lib.optionalAttrs (stdenv'.cc.isClang or false) { } // lib.optionalAttrs (stdenv'.cc.isClang or false) {

2
pkgs/stdenv/generic/make-derivation.nix
View File

@ -104,7 +104,7 @@ in rec {
++ depsHostHost ++ depsHostHostPropagated ++ depsHostHost ++ depsHostHostPropagated
++ buildInputs ++ propagatedBuildInputs ++ buildInputs ++ propagatedBuildInputs
++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || (stdenv.noCC or false); dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC;
supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
# Musl-based platforms will keep "pie", other platforms will not. # Musl-based platforms will keep "pie", other platforms will not.
defaultHardeningFlags = if stdenv.hostPlatform.isMusl && defaultHardeningFlags = if stdenv.hostPlatform.isMusl &&

2
pkgs/top-level/all-packages.nix
View File

@ -30,7 +30,7 @@ in
# just the plain stdenv. # just the plain stdenv.
stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv); stdenv_32bit = lowPrio (if stdenv.hostPlatform.is32bit then stdenv else multiStdenv);
stdenvNoCC = stdenv.override { cc = null; extraAttrs.noCC = true; }; stdenvNoCC = stdenv.override { cc = null; hasCC = false; };
mkStdenvNoLibs = stdenv: let mkStdenvNoLibs = stdenv: let
bintools = stdenv.cc.bintools.override { bintools = stdenv.cc.bintools.override {