diff options
author | John Ericson <git@JohnEricson.me> | 2021-04-23 20:57:18 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-23 20:57:18 -0400 |
commit | 96b2cb441c736427f121d8cbf5a62183c1c46c32 (patch) | |
tree | e9ef2ea8d82f82ecc535613a667f87160dc33271 /pkgs/os-specific/bsd | |
parent | 5640a6dcbe66682f445b1981c682c6d300100ae7 (diff) | |
parent | b867117b86d55c89b5a06565023824c38d446ac5 (diff) | |
download | nixpkgs-96b2cb441c736427f121d8cbf5a62183c1c46c32.tar nixpkgs-96b2cb441c736427f121d8cbf5a62183c1c46c32.tar.gz nixpkgs-96b2cb441c736427f121d8cbf5a62183c1c46c32.tar.bz2 nixpkgs-96b2cb441c736427f121d8cbf5a62183c1c46c32.tar.lz nixpkgs-96b2cb441c736427f121d8cbf5a62183c1c46c32.tar.xz nixpkgs-96b2cb441c736427f121d8cbf5a62183c1c46c32.tar.zst nixpkgs-96b2cb441c736427f121d8cbf5a62183c1c46c32.zip |
Merge pull request #120283 from Ericson2314/netbsd-fewer-vars
netbsd: Remove some env vars that are probably not needed.
Diffstat (limited to 'pkgs/os-specific/bsd')
-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 32ec884aac3..ae5091a6a49 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) { |