mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-19 03:14:03 +00:00
root: fix output directory layout with -Dgnuinstall=ON
Make "$out" more conformant to the bin/ lib/ share/ hirarchy instead of messing up the user profile with stuff like cmake/ config/ macros/ icons/ js/ tutorials/ ... In this layout, * `tutorials` is now under `share/doc/ROOT/tutorial` * `cmake`, `font`, `icons`, `js` and `macro` is now under `share/root` * `Makefile.comp` and `Makefile.config` in now under `etc/root`.
This commit is contained in:
parent
c09e03c1a6
commit
c1027175c1
@ -288,6 +288,22 @@
|
||||
dynamically.
|
||||
</para>
|
||||
</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>
|
||||
<para>
|
||||
Enabling global redirect in
|
||||
|
@ -82,6 +82,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 `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.
|
||||
|
||||
- Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store.
|
||||
|
@ -171,6 +171,7 @@ stdenv.mkDerivation rec {
|
||||
"-Dfftw3=OFF"
|
||||
"-Dfitsio=OFF"
|
||||
"-Dfortran=OFF"
|
||||
"-Dgnuinstall=ON"
|
||||
"-Dimt=ON"
|
||||
"-Dgfal=OFF"
|
||||
"-Dgviz=OFF"
|
||||
|
Loading…
Reference in New Issue
Block a user