Merge pull request #207034 from ShamrockLee/root-layout
This commit is contained in:
commit
f837537cdd
|
@ -514,6 +514,22 @@
|
||||||
dynamically.
|
dynamically.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
The <literal>root</literal> package is now built with the
|
||||||
|
<literal>"-Dgnuinstall=ON"</literal> CMake flag,
|
||||||
|
making the output conform the <literal>bin</literal>
|
||||||
|
<literal>lib</literal> <literal>share</literal> layout. In
|
||||||
|
this layout, <literal>tutorials</literal> is under
|
||||||
|
<literal>share/doc/ROOT/</literal>; <literal>cmake</literal>,
|
||||||
|
<literal>font</literal>, <literal>icons</literal>,
|
||||||
|
<literal>js</literal> and <literal>macro</literal> under
|
||||||
|
<literal>share/root</literal>;
|
||||||
|
<literal>Makefile.comp</literal> and
|
||||||
|
<literal>Makefile.config</literal> under
|
||||||
|
<literal>etc/root</literal>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
Enabling global redirect in
|
Enabling global redirect in
|
||||||
|
|
|
@ -135,6 +135,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
|
|
||||||
- The new option `users.motdFile` allows configuring a Message Of The Day that can be updated dynamically.
|
- The new option `users.motdFile` allows configuring a Message Of The Day that can be updated dynamically.
|
||||||
|
|
||||||
|
- The `root` package is now built with the `"-Dgnuinstall=ON"` CMake flag, making the output conform the `bin` `lib` `share` layout. In this layout, `tutorials` is under `share/doc/ROOT/`; `cmake`, `font`, `icons`, `js` and `macro` under `share/root`; `Makefile.comp` and `Makefile.config` under `etc/root`.
|
||||||
|
|
||||||
- Enabling global redirect in `services.nginx.virtualHosts` now allows one to add exceptions with the `locations` option.
|
- Enabling global redirect in `services.nginx.virtualHosts` now allows one to add exceptions with the `locations` option.
|
||||||
|
|
||||||
- A new option `recommendedBrotliSettings` has been added to `services.nginx`. Learn more about compression in Brotli format [here](https://github.com/google/ngx_brotli/blob/master/README.md).
|
- A new option `recommendedBrotliSettings` has been added to `services.nginx`. Learn more about compression in Brotli format [here](https://github.com/google/ngx_brotli/blob/master/README.md).
|
||||||
|
|
|
@ -157,9 +157,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-Drpath=ON"
|
"-Drpath=ON"
|
||||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
|
||||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
|
||||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
|
||||||
"-Dbuiltin_llvm=OFF"
|
"-Dbuiltin_llvm=OFF"
|
||||||
"-Dbuiltin_nlohmannjson=OFF"
|
"-Dbuiltin_nlohmannjson=OFF"
|
||||||
"-Dbuiltin_openui5=OFF"
|
"-Dbuiltin_openui5=OFF"
|
||||||
|
@ -174,6 +171,7 @@ stdenv.mkDerivation rec {
|
||||||
"-Dfftw3=OFF"
|
"-Dfftw3=OFF"
|
||||||
"-Dfitsio=OFF"
|
"-Dfitsio=OFF"
|
||||||
"-Dfortran=OFF"
|
"-Dfortran=OFF"
|
||||||
|
"-Dgnuinstall=ON"
|
||||||
"-Dimt=ON"
|
"-Dimt=ON"
|
||||||
"-Dgfal=OFF"
|
"-Dgfal=OFF"
|
||||||
"-Dgviz=OFF"
|
"-Dgviz=OFF"
|
||||||
|
|
Loading…
Reference in a new issue