diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-25 23:10:03 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-30 22:04:21 -0500 |
| commit | 5b74540c5be2ca4c47b61ef9d0776412266addeb (patch) | |
| tree | 22d8dd57f45d6da911c4d46bda4b65d47ecd1eb7 /pkgs/development/libraries | |
| parent | 3a50395ef226259694689da92b2fd636476abc67 (diff) | |
| download | nixpkgs-5b74540c5be2ca4c47b61ef9d0776412266addeb.tar nixpkgs-5b74540c5be2ca4c47b61ef9d0776412266addeb.tar.gz nixpkgs-5b74540c5be2ca4c47b61ef9d0776412266addeb.tar.bz2 nixpkgs-5b74540c5be2ca4c47b61ef9d0776412266addeb.tar.lz nixpkgs-5b74540c5be2ca4c47b61ef9d0776412266addeb.tar.xz nixpkgs-5b74540c5be2ca4c47b61ef9d0776412266addeb.tar.zst nixpkgs-5b74540c5be2ca4c47b61ef9d0776412266addeb.zip | |
treewide: Use `depsBuildBuild` for buildPackges.stdenv.cc
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libopcodes/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 86f3be15fea..c5d8dbf9bcb 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; - nativeBuildInputs = lib.optional (cross != null) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index e3bacc86d58..dce052f8baa 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -19,8 +19,8 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; passthru.static = self.out; - nativeBuildInputs = [ m4 ] - ++ stdenv.lib.optional (buildPlatform != hostPlatform) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ m4 ]; configureFlags = # Build a "fat binary", with routines for several sub-architectures diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index 7ffc40f1494..d6d6989761b 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { find . ../include/opcode -type f -exec sed {} -i -e 's/"bfd.h"/<bfd.h>/' \; ''; - nativeBuildInputs = [ autoreconfHook264 bison buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ autoreconfHook264 bison ]; buildInputs = [ libiberty ]; # dis-asm.h includes bfd.h propagatedBuildInputs = [ libbfd ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 9aade8b9672..79414f016d3 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -37,10 +37,11 @@ stdenv.mkDerivation rec { # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ] ++ lib.optionals (buildPlatform != hostPlatform) [ - buildPackages.ncurses buildPackages.stdenv.cc + buildPackages.ncurses ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; |