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

mkDerivation: cleaner handling of the name argument

Browse Source
This commit is contained in:
Vincent Laporte 2019-02-01 15:59:12 +00:00
parent a06952dbb1
commit 0d17ecce2c
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/stdenv/generic/make-derivation.nix
View File

@ -12,7 +12,7 @@ rec {
# * https://nixos.org/nix/manual/#ssec-derivation # * https://nixos.org/nix/manual/#ssec-derivation
# Explanation about derivations in general # Explanation about derivations in general
mkDerivation = mkDerivation =
{ name ? "" {
# These types of dependencies are all exhaustively documented in # These types of dependencies are all exhaustively documented in
# the "Specifying Dependencies" section of the "Standard # the "Specifying Dependencies" section of the "Standard
@ -21,7 +21,7 @@ rec {
# TODO(@Ericson2314): Stop using legacy dep attribute names # TODO(@Ericson2314): Stop using legacy dep attribute names
# host offset -> target offset # host offset -> target offset
, depsBuildBuild ? [] # -1 -> -1 depsBuildBuild ? [] # -1 -> -1
, depsBuildBuildPropagated ? [] # -1 -> -1 , depsBuildBuildPropagated ? [] # -1 -> -1
, nativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name , nativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name
, propagatedNativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name , propagatedNativeBuildInputs ? [] # -1 -> 0 N.B. Legacy name
@ -177,14 +177,14 @@ rec {
"checkInputs" "installCheckInputs" "checkInputs" "installCheckInputs"
"__impureHostDeps" "__propagatedImpureHostDeps" "__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"]) "sandboxProfile" "propagatedSandboxProfile"])
// (lib.optionalAttrs (name == "")) { // (lib.optionalAttrs (!(attrs ? name))) {
name = "${attrs.pname}-${attrs.version}"; name = "${attrs.pname}-${attrs.version}";
} // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)) { } // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)) {
# Fixed-output derivations like source tarballs shouldn't get a host # Fixed-output derivations like source tarballs shouldn't get a host
# suffix. But we have some weird ones with run-time deps that are # suffix. But we have some weird ones with run-time deps that are
# just used for their side-affects. Those might as well since the # just used for their side-affects. Those might as well since the
# hash can't be the same. See #32986. # hash can't be the same. See #32986.
name = "${if name != "" then name else "${attrs.pname}-${attrs.version}"}-${stdenv.hostPlatform.config}"; name = "${attrs.name or "${attrs.pname}-${attrs.version}"}-${stdenv.hostPlatform.config}";
} // { } // {
builder = attrs.realBuilder or stdenv.shell; builder = attrs.realBuilder or stdenv.shell;
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
@ -274,7 +274,7 @@ rec {
meta = { meta = {
# `name` above includes cross-compilation cruft (and is under assert), # `name` above includes cross-compilation cruft (and is under assert),
# lets have a clean always accessible version here. # lets have a clean always accessible version here.
name = if name != "" then name else "${attrs.pname}-${attrs.version}"; name = attrs.name or "${attrs.pname}-${attrs.version}";
# If the packager hasn't specified `outputsToInstall`, choose a default, # If the packager hasn't specified `outputsToInstall`, choose a default,
# which is the name of `p.bin or p.out or p`; # which is the name of `p.bin or p.out or p`;