diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-14 12:19:37 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 15:59:44 +0200 |
commit | 9a824f2f1dd01450e6f7270246f77210d4c9c2a5 (patch) | |
tree | 1fee3082bf0afd33df0335ec18338823b66b2ca3 | |
parent | 2995439003a6473fc6531d09900e183b0d5de425 (diff) | |
download | nixlib-9a824f2f1dd01450e6f7270246f77210d4c9c2a5.tar nixlib-9a824f2f1dd01450e6f7270246f77210d4c9c2a5.tar.gz nixlib-9a824f2f1dd01450e6f7270246f77210d4c9c2a5.tar.bz2 nixlib-9a824f2f1dd01450e6f7270246f77210d4c9c2a5.tar.lz nixlib-9a824f2f1dd01450e6f7270246f77210d4c9c2a5.tar.xz nixlib-9a824f2f1dd01450e6f7270246f77210d4c9c2a5.tar.zst nixlib-9a824f2f1dd01450e6f7270246f77210d4c9c2a5.zip |
treewide: rename extraOutputs{ToLink,ToInstall}
This is to get more consistent with `meta.outputsToInstall`.
-rw-r--r-- | nixos/modules/config/debug-info.nix | 2 | ||||
-rw-r--r-- | nixos/modules/config/system-path.nix | 4 | ||||
-rw-r--r-- | nixos/modules/programs/man.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/buildenv/default.nix | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix index 777ae71eebfb..17cb862d2916 100644 --- a/nixos/modules/config/debug-info.nix +++ b/nixos/modules/config/debug-info.nix @@ -38,7 +38,7 @@ with lib; # environment.pathsToLink, and we can't have both. #environment.pathsToLink = [ "/lib/debug/.build-id" ]; - environment.extraOutputsToLink = + environment.extraOutputsToInstall = optional config.environment.enableDebugInfo "debug"; }; diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 69830683d9c5..d7815324c4c4 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -73,7 +73,7 @@ in description = "List of directories to be symlinked in <filename>/run/current-system/sw</filename>."; }; - extraOutputsToLink = mkOption { + extraOutputsToInstall = mkOption { type = types.listOf types.str; default = [ ]; example = [ "doc" "info" "docdev" ]; @@ -123,7 +123,7 @@ in system.path = pkgs.buildEnv { name = "system-path"; paths = config.environment.systemPackages; - inherit (config.environment) pathsToLink extraOutputsToLink; + inherit (config.environment) pathsToLink extraOutputsToInstall; ignoreCollisions = true; # !!! Hacky, should modularise. # outputs TODO: note that the tools will often not be linked by default diff --git a/nixos/modules/programs/man.nix b/nixos/modules/programs/man.nix index 94d026fdaef0..201144ccb451 100644 --- a/nixos/modules/programs/man.nix +++ b/nixos/modules/programs/man.nix @@ -23,7 +23,7 @@ with lib; environment.pathsToLink = [ "/share/man" ]; - environment.extraOutputsToLink = [ "man" ]; + environment.extraOutputsToInstall = [ "man" ]; }; diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 10f7c69c3aa1..8b2167a8e74f 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -27,7 +27,7 @@ , # The package outputs to include. By default, only the default # output is included. - extraOutputsToLink ? [] + extraOutputsToInstall ? [] , # Root the result in directory "$out${extraPrefix}", e.g. "/share". extraPrefix ? "" @@ -55,7 +55,7 @@ runCommand name else [ drv ]) # Add any extra outputs specified by the caller of `buildEnv`. ++ 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; }) paths); preferLocalBuild = true; |