1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-16 09:02:36 +00:00
nixpkgs/pkgs
Alyssa Ross be1b22538a 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
a714284d8b.

Fixes: https://github.com/NixOS/nixpkgs/issues/82304
2020-06-29 13:56:27 +00:00
..
applications Merge staging-next into staging 2020-06-25 20:36:08 +02:00
build-support stdenv: fix backward multiple outputs conditional 2020-06-29 13:56:27 +00:00
common-updater
data Merge master into staging-next 2020-06-24 19:04:03 +02:00
desktops Merge master into staging-next 2020-06-24 19:04:03 +02:00
development cmake: only set output paths with multiple outputs 2020-06-29 13:56:27 +00:00
games treewide: remove deprecated value Application from makeDesktopItem 2020-06-25 12:18:37 +10:00
misc Merge staging-next into staging 2020-06-25 20:36:08 +02:00
os-specific Merge staging-next into staging 2020-06-25 20:35:19 +02:00
servers grafana: 7.0.3 -> 7.0.4 2020-06-25 10:18:25 -07:00
shells oh-my-zsh: 2020-06-19 -> 2020-06-23 2020-06-24 08:25:10 -04:00
stdenv C++ Compilers: Systematize handling of standard libraries 2020-06-22 04:24:44 +00:00
test
tools Merge #91711: file: backport patch to fix a regression 2020-06-28 18:31:14 +02:00
top-level Merge pull request #91605 from primeos/libva 2020-06-28 17:44:31 +02:00