diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:08:19 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:08:19 +0100 |
commit | 5be0a9acd7b9abe4bff3202a7ac7defc17a37877 (patch) | |
tree | 25491a83f604f1ace6a1170505955df5817495c2 /pkgs/development/tools | |
parent | f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf (diff) | |
download | nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.gz nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.bz2 nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.lz nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.xz nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.zst nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.zip |
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms "hostDrv" and "buildDrv" are not very intuitive, even if they're consistent with GNU terminology).
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/misc/cscope/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/elfutils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/gdb/default.nix | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index b9d2c10f5371..00d633c14ae8 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { crossAttrs = { postInstall = ""; - propagatedBuildInputs = [ ncurses.hostDrv ]; + propagatedBuildInputs = [ ncurses.crossDrv ]; }; meta = { diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 61b4647552d5..ae8993c80ca3 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { /* Having bzip2 will harm, because anything using elfutils as buildInput cross-building, will not be able to run 'bzip2' */ - propagatedBuildInputs = [ zlib.hostDrv ]; + propagatedBuildInputs = [ zlib.crossDrv ]; # This program does not cross-build fine. So I only cross-build some parts # I need for the linux perf tool. diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 08fde14eb53a..573a233f17c3 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -11,8 +11,8 @@ let basename = "gdb-7.5"; # Whether (cross-)building for GNU/Hurd. This is an approximation since - # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and - # `buildDrv'. + # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and + # `nativeDrv'. isGNU = stdenv.system == "i686-gnu" || (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu"); @@ -51,8 +51,8 @@ stdenv.mkDerivation rec { crossAttrs = { # Do not add --with-python here to avoid cross building it. configureFlags = - '' --with-gmp=${gmp.hostDrv} --with-mpfr=${mpfr.hostDrv} --with-system-readline - --with-expat --with-libexpat-prefix=${expat.hostDrv} --without-python + '' --with-gmp=${gmp.crossDrv} --with-mpfr=${mpfr.crossDrv} --with-system-readline + --with-expat --with-libexpat-prefix=${expat.crossDrv} --without-python '' + stdenv.lib.optionalString (target != null) " --target=${target.config}"; }; |