public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netbsd: Remove some env vars that are probably not needed.

Browse Source 
Tool setup hooks will set most.
This commit is contained in:
John Ericson 2020-03-09 02:10:06 -04:00 committed by John Ericson
parent f684c917a6
commit b867117b86
1 changed files with 4 additions and 9 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) {