diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-04 18:10:42 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-04 18:10:42 +0000 |
| commit | 19b98110126fde7cbb1127af7e3fe1568eacad3d (patch) | |
| tree | a32e49d08765b5d8ff0b5b7eaae87ae3907e1542 /pkgs/tools/text | |
| parent | 2d261d1c1ed28e396ec0305075ccffb25b416abc (diff) | |
| download | nixpkgs-19b98110126fde7cbb1127af7e3fe1568eacad3d.tar nixpkgs-19b98110126fde7cbb1127af7e3fe1568eacad3d.tar.gz nixpkgs-19b98110126fde7cbb1127af7e3fe1568eacad3d.tar.bz2 nixpkgs-19b98110126fde7cbb1127af7e3fe1568eacad3d.tar.lz nixpkgs-19b98110126fde7cbb1127af7e3fe1568eacad3d.tar.xz nixpkgs-19b98110126fde7cbb1127af7e3fe1568eacad3d.tar.zst nixpkgs-19b98110126fde7cbb1127af7e3fe1568eacad3d.zip | |
Making a bunch of basic programs cross-buildable.
After this, the 'bootstrap-tools' can be cross-built. svn path=/nixpkgs/branches/stdenv-updates/; revision=20945
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/diffutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/gnupatch/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/text/replace/default.nix | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 44b7715607c..d75485cf047 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; /* If no explicit coreutils is given, use the one from stdenv. */ - buildInputs = [coreutils]; + buildNativeInputs = [coreutils]; meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index cd2a67f6993..e6383f40a7c 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { buildInputs = (stdenv.lib.optional doCheck ed); + crossAttrs = { + configureFlags = [ "ac_cv_func_strnlen_working=yes" ]; + }; + doCheck = true; meta = { diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 0182a3bb48d..339bf510c4b 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { makeFlags = ["TREE=\$(out)"]; + crossAttrs = { + makeFlags = [ "TREE=\$(out)" "CC=${stdenv.cross.config}-gcc" ]; + }; + postInstall = "mv \$out/bin/replace \$out/bin/replace-literal"; patches = [./malloc.patch]; |