Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: d87b595e5326
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3abe43e22d4c
Choose a head ref
  • 5 commits
  • 5 files changed
  • 1 contributor

Commits on Jun 29, 2020

  1. stdenv: fix backward multiple outputs conditional 

    This is supposed to shareDocName to a fallback value if it can't be
determined from looking at the configure script.  But the conditional
checked whether shareDocName was set, rather than if it wasn't.  This
meant that if shareDocName had been detected from a configure script,
it would be immediately overridden by the package name, and if it
couldn't be detected, shareDocName would remain unset.

This resulted in QEMU installing files like $out/share/doc/index.html,
which should of course have been in $out/share/doc/qemu/index.html.

An interesting side effect of this is that, since
9f87515 when this code was added, the
detected package name has never actually been used for installing
documentation, because it would always be overridden.  So this patch
will actually enable that for the first time, four years later.

Fixes: #90486
    @alyssais
    alyssais committed Jun 29, 2020
    Copy the full SHA
    1421404 View commit details
    Browse the repository at this point in the history

  2. cmake: only set output paths with multiple outputs 

    This brings cmake inline with the behaviour used for configure
scripts, defined in multiple-outputs.sh.  It's important because
that setup hook will only set shareDocName if multiple outputs are in
use (and setOutputFlags hasn't been disabled).  So previously,
CMAKE_INSTALL_DOCDIR would be set to $out/share/doc for single-output
derivations, instead of $out/share/doc/$shareDocName, which would
result in collisions.

Since this hook now uses the setOutputFlags variable, I had to remove
the empty assignment of it added in
a714284.

Fixes: #82304
    @alyssais
    alyssais committed Jun 29, 2020
    7
    Copy the full SHA
    be1b225 View commit details
    Browse the repository at this point in the history

  3. ghostscript: fix build 

    This hack is no longer necessary, since multiple-outputs.sh has been
fixed to install docs in the right location.
    @alyssais
    alyssais committed Jun 29, 2020
    Copy the full SHA
    39fef70 View commit details
    Browse the repository at this point in the history

  4. Revert "darktable: Remove doc directory from output" 

    This reverts commit 730133e.

multiple-outputs.sh has been fixed, so documentation is now
corrrrectly installed under $out/share/doc/darktable.

Fixes: #72160
Fixes: #83248
    @alyssais
    alyssais committed Jun 29, 2020
    Copy the full SHA
    10bb063 View commit details
    Browse the repository at this point in the history

  5. transmission: install documentation 

    The risk of collisions is gone now because documentation is correctly
installed into $out/share/doc/transmission instead of $out/share/doc
as before.
    @alyssais
    alyssais committed Jun 29, 2020
    Copy the full SHA
    3abe43e View commit details
    Browse the repository at this point in the history