diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 16:35:04 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 16:35:04 -0400 |
commit | 67db915a4391d5c74307089a388ada26a03dadff (patch) | |
tree | ad08c490ac215efd93c5d49dca892be28efeee97 /pkgs/tools/text | |
parent | 1d90ea9194633503e30494fa5e050924c8a3e56f (diff) | |
parent | 5789cf479146e698ad5c6645fddf8a7a14475885 (diff) | |
download | nixpkgs-67db915a4391d5c74307089a388ada26a03dadff.tar nixpkgs-67db915a4391d5c74307089a388ada26a03dadff.tar.gz nixpkgs-67db915a4391d5c74307089a388ada26a03dadff.tar.bz2 nixpkgs-67db915a4391d5c74307089a388ada26a03dadff.tar.lz nixpkgs-67db915a4391d5c74307089a388ada26a03dadff.tar.xz nixpkgs-67db915a4391d5c74307089a388ada26a03dadff.tar.zst nixpkgs-67db915a4391d5c74307089a388ada26a03dadff.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/gnused/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 47193e61615..af3db54e96d 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -14,13 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; preConfigure = "patchShebangs ./build-aux/help2man"; - crossAttrs = { - # The tarball ships with a fine prebuilt manpage, but the make rules try to rebuild it, - # which won't work when cross compiling as help2man needs to execute the binaries. - postConfigure = '' - sed -i Makefile -e 's|doc/sed\.1:|dummy:|' - ''; - }; + # Prevents attempts of running 'help2man' on cross-built binaries. + PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; meta = { homepage = http://www.gnu.org/software/sed/; |