Unverified Commit 91e18d3c authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

ruby: move NROFF variable into env for structuredAttrs (#489375)

parents 7b7c174d c45e849e

pkgs/development/interpreters/ruby/default.nix

+11 −9
Original line number Diff line number Diff line
@@ -129,9 +129,6 @@ let 
            inherit hash;

          };



          # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.

          NROFF = if docSupport then "${groff}/bin/nroff" else null;



          outputs = [ "out" ] ++ lib.optional docSupport "devdoc";



          strictDeps = true;
@@ -174,11 +171,16 @@ let 
          ];

          propagatedBuildInputs = op jemallocSupport jemalloc;



          env = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) {

          env =

            lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) {

              # The ruby build system will use a bare `rust` command by default for its rust.

              # We can use the Nixpkgs rust wrapper to work around the fact that our Rust builds

              # for cross-compilation output for the build target by default.

              NIX_RUSTFLAGS = "--target ${stdenv.hostPlatform.rust.rustcTargetSpec}";

            }

            // lib.optionalAttrs docSupport {

              # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.

              NROFF = "${groff}/bin/nroff";

            };



          enableParallelBuilding = true;