diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/top-level/impure.nix | |
parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/top-level/impure.nix')
-rw-r--r-- | nixpkgs/pkgs/top-level/impure.nix | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/nixpkgs/pkgs/top-level/impure.nix b/nixpkgs/pkgs/top-level/impure.nix index d390bd9025fa..478ea89da36f 100644 --- a/nixpkgs/pkgs/top-level/impure.nix +++ b/nixpkgs/pkgs/top-level/impure.nix @@ -12,17 +12,15 @@ let in -{ # We combine legacy `system` and `platform` into `localSystem`, if - # `localSystem` was not passed. Strictly speaking, this is pure desugar, but - # it is most convient to do so before the impure `localSystem.system` default, - # so we do it now. - localSystem ? builtins.intersectAttrs { system = null; platform = null; } args +{ # We put legacy `system` into `localSystem`, if `localSystem` was not passed. + # If neither is passed, assume we are building packages on the current + # (build, in GNU Autotools parlance) platform. + localSystem ? { system = args.system or builtins.currentSystem; } -, # These are needed only because nix's `--arg` command-line logic doesn't work - # with unnamed parameters allowed by ... - system ? localSystem.system -, platform ? localSystem.platform -, crossSystem ? null +# These are needed only because nix's `--arg` command-line logic doesn't work +# with unnamed parameters allowed by ... +, system ? localSystem.system +, crossSystem ? localSystem , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or # $HOME/.config/nixpkgs/config.nix. @@ -77,15 +75,11 @@ in , ... } @ args: -# If `localSystem` was explicitly passed, legacy `system` and `platform` should -# not be passed. -assert args ? localSystem -> !(args ? system || args ? platform); +# If `localSystem` was explicitly passed, legacy `system` should +# not be passed, and vice-versa. +assert args ? localSystem -> !(args ? system); +assert args ? system -> !(args ? localSystem); -import ./. (builtins.removeAttrs args [ "system" "platform" ] // { - inherit config overlays crossSystem crossOverlays; - # Fallback: Assume we are building packages on the current (build, in GNU - # Autotools parlance) system. - localSystem = if builtins.isString localSystem then localSystem - else (if args ? localSystem then {} - else { system = builtins.currentSystem; }) // localSystem; +import ./. (builtins.removeAttrs args [ "system" ] // { + inherit config overlays localSystem; }) |