BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #25301 from matthewbauer/impure-cross

Browse source 
impure.nix: add crossSystem as arg
This commit is contained in:
John Ericson 2017-04-29 23:19:52 +01:00 committed by GitHub
commit f71456ac24
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/top-level/impure.nix
View file

@ -22,6 +22,7 @@ in
# with unnamed parameters allowed by ...
system ? localSystem.system
, platform ? localSystem.platform
, crossSystem ? null
, # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or
# $HOME/.config/nixpkgs/config.nix.
@ -61,7 +62,7 @@ in
assert args ? localSystem -> !(args ? system || args ? platform);
import ./. (builtins.removeAttrs args [ "system" "platform" ] // {
inherit config overlays;
inherit config overlays crossSystem;
# Fallback: Assume we are building packages on the current (build, in GNU
# Autotools parlance) system.
localSystem = { system = builtins.currentSystem; } // localSystem;