public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: rename extraOutputs{ToLink,ToInstall}

Browse Source 
This is to get more consistent with `meta.outputsToInstall`.
This commit is contained in:
Vladimír Čunát 2016-03-14 12:19:37 +01:00
parent 2995439003
commit 9a824f2f1d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/debug-info.nix
View File

@ -38,7 +38,7 @@ with lib;
# environment.pathsToLink, and we can't have both. # environment.pathsToLink, and we can't have both.
#environment.pathsToLink = [ "/lib/debug/.build-id" ]; #environment.pathsToLink = [ "/lib/debug/.build-id" ];
environment.extraOutputsToLink = environment.extraOutputsToInstall =
optional config.environment.enableDebugInfo "debug"; optional config.environment.enableDebugInfo "debug";
}; };

4
nixos/modules/config/system-path.nix
View File

@ -73,7 +73,7 @@ in
description = "List of directories to be symlinked in <filename>/run/current-system/sw</filename>."; description = "List of directories to be symlinked in <filename>/run/current-system/sw</filename>.";
}; };
extraOutputsToLink = mkOption { extraOutputsToInstall = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ ]; default = [ ];
example = [ "doc" "info" "docdev" ]; example = [ "doc" "info" "docdev" ];
@ -123,7 +123,7 @@ in
system.path = pkgs.buildEnv { system.path = pkgs.buildEnv {
name = "system-path"; name = "system-path";
paths = config.environment.systemPackages; paths = config.environment.systemPackages;
inherit (config.environment) pathsToLink extraOutputsToLink; inherit (config.environment) pathsToLink extraOutputsToInstall;
ignoreCollisions = true; ignoreCollisions = true;
# !!! Hacky, should modularise. # !!! Hacky, should modularise.
# outputs TODO: note that the tools will often not be linked by default # outputs TODO: note that the tools will often not be linked by default

2
nixos/modules/programs/man.nix
View File

@ -23,7 +23,7 @@ with lib;
environment.pathsToLink = [ "/share/man" ]; environment.pathsToLink = [ "/share/man" ];
environment.extraOutputsToLink = [ "man" ]; environment.extraOutputsToInstall = [ "man" ];
}; };

4
pkgs/build-support/buildenv/default.nix
View File

@ -27,7 +27,7 @@
, # The package outputs to include. By default, only the default , # The package outputs to include. By default, only the default
# output is included. # output is included.
extraOutputsToLink ? [] extraOutputsToInstall ? []
, # Root the result in directory "$out${extraPrefix}", e.g. "/share". , # Root the result in directory "$out${extraPrefix}", e.g. "/share".
extraPrefix ? "" extraPrefix ? ""
@ -55,7 +55,7 @@ runCommand name
else [ drv ]) else [ drv ])
# Add any extra outputs specified by the caller of `buildEnv`. # Add any extra outputs specified by the caller of `buildEnv`.
++ lib.filter (p: p!=null) ++ lib.filter (p: p!=null)
(builtins.map (outName: drv.${outName} or null) extraOutputsToLink); (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall);
priority = drv.meta.priority or 5; priority = drv.meta.priority or 5;
}) paths); }) paths);
preferLocalBuild = true; preferLocalBuild = true;