diff options
author | John Ericson <git@JohnEricson.me> | 2020-03-09 02:10:06 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-04-23 21:55:09 +0000 |
commit | b867117b86d55c89b5a06565023824c38d446ac5 (patch) | |
tree | 9646208bb947599ffccb1e78b0ee6616a6e0ebfc | |
parent | f684c917a6c3919e8dff6b79f317da8ad148e44b (diff) |
netbsd: Remove some env vars that are probably not needed.
Tool setup hooks will set most.
-rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index aa55088a4a352..ca2f65036a26e 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -63,8 +63,7 @@ in lib.makeScopeWithSplicing ]; buildInputs = with self; compatIfNeeded; - OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - HOST_SH = "${buildPackages.bash}/bin/sh"; + HOST_SH = stdenv'.shell; MACHINE_ARCH = { i686 = "i386"; @@ -78,13 +77,6 @@ in lib.makeScopeWithSplicing }.${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; strictDeps = true; @@ -94,6 +86,9 @@ in lib.makeScopeWithSplicing platforms = platforms.unix; license = licenses.bsd2; }; + } // lib.optionalAttrs stdenv'.hasCC { + # TODO should CC wrapper set this? + CPP = "${stdenv'.cc.targetPrefix}cpp"; } // lib.optionalAttrs stdenv'.isDarwin { MKRELRO = "no"; } // lib.optionalAttrs (stdenv'.cc.isClang or false) { |