diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-05-10 14:38:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-10 14:38:58 -0400 |
| commit | 1d90ea9194633503e30494fa5e050924c8a3e56f (patch) | |
| tree | 8c554f983cebccb5fb878f3d032294c47714bb39 /pkgs/tools/text | |
| parent | f40aa17933bc07d7913fd705b5f8ce50aab86782 (diff) | |
| parent | c42118bb822ae35431343109aeb903f2c2d121af (diff) | |
| download | nixpkgs-1d90ea9194633503e30494fa5e050924c8a3e56f.tar nixpkgs-1d90ea9194633503e30494fa5e050924c8a3e56f.tar.gz nixpkgs-1d90ea9194633503e30494fa5e050924c8a3e56f.tar.bz2 nixpkgs-1d90ea9194633503e30494fa5e050924c8a3e56f.tar.lz nixpkgs-1d90ea9194633503e30494fa5e050924c8a3e56f.tar.xz nixpkgs-1d90ea9194633503e30494fa5e050924c8a3e56f.tar.zst nixpkgs-1d90ea9194633503e30494fa5e050924c8a3e56f.zip | |
Merge pull request #40294 from obsidiansystems/no-crossAttrs
misc packages: Fewer crossAttrs
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/groff/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 4495a85b288..27581134ca3 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -50,15 +50,14 @@ stdenv.mkDerivation rec { "ac_cv_path_PERL=${buildPackages.perl}/bin/perl" ]; - doCheck = true; - - crossAttrs = { + makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ # Trick to get the build system find the proper 'native' groff # http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html - preBuild = '' - makeFlags="GROFF_BIN_PATH=${buildPackages.groff}/bin GROFFBIN=${buildPackages.groff}/bin/groff" - ''; - }; + "GROFF_BIN_PATH=${buildPackages.groff}/bin" + "GROFFBIN=${buildPackages.groff}/bin/groff" + ]; + + doCheck = true; # Remove example output with (random?) colors and creation date # to avoid non-determinism in the output. |